diff --git a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java
index b30083cf315..afa5d4e36db 100644
--- a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java
+++ b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java
@@ -35,9 +35,9 @@ public interface ObjectInDataStoreStateMachine extends StateObject<ObjectInDataS
         Failed("Failed to download Template"),
         Hidden("The object is hidden from the user");
 
-        String _description;
+        final String _description;
 
-        private State(String description) {
+        State(String description) {
             _description = description;
         }
 
@@ -50,7 +50,7 @@ public interface ObjectInDataStoreStateMachine extends StateObject<ObjectInDataS
         CreateRequested,
         CreateOnlyRequested,
         DestroyRequested,
-        OperationSuccessed,
+        OperationSucceeded,
         OperationFailed,
         CopyRequested,
         CopyingRequested,
diff --git a/engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java b/engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java
index 889d0ce14cc..21ef851fb2f 100644
--- a/engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java
+++ b/engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java
@@ -323,7 +323,7 @@ public class StorageCacheManagerImpl implements StorageCacheManager, Manager {
             if (result.isFailed()) {
                 objOnCacheStore.processEvent(Event.OperationFailed);
             } else {
-                objOnCacheStore.processEvent(Event.OperationSuccessed, result.getAnswer());
+                objOnCacheStore.processEvent(Event.OperationSucceeded, result.getAnswer());
                 objOnCacheStore.incRefCount();
                 return objOnCacheStore;
             }
diff --git a/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
index c494ca31594..6b8f4715482 100644
--- a/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
+++ b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
@@ -401,7 +401,7 @@ public class AncientDataMotionStrategy implements DataMotionStrategy {
                     return answer;
                 }
 
-                objOnImageStore.processEvent(Event.OperationSuccessed, answer);
+                objOnImageStore.processEvent(Event.OperationSucceeded, answer);
 
                 objOnImageStore.processEvent(Event.CopyingRequested);
 
@@ -432,7 +432,7 @@ public class AncientDataMotionStrategy implements DataMotionStrategy {
                 throw e;
             }
 
-            objOnImageStore.processEvent(Event.OperationSuccessed);
+            objOnImageStore.processEvent(Event.OperationSucceeded);
             deleteVolumeOnSecondaryStore(objOnImageStore);
             return answer;
         } else {
diff --git a/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java
index fa8a7a79aa3..61d2caa0e06 100644
--- a/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java
+++ b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java
@@ -1058,7 +1058,7 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy {
 
             //submit processEvent
             if (StringUtils.isEmpty(errMsg)) {
-                snapshotInfo.processEvent(Event.OperationSuccessed);
+                snapshotInfo.processEvent(Event.OperationSucceeded);
             } else {
                 snapshotInfo.processEvent(Event.OperationFailed);
             }
@@ -1221,7 +1221,7 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy {
                     // command to copy this data from cache to secondary storage. We
                     // then clean up the cache.
 
-                    destOnStore.processEvent(Event.OperationSuccessed, copyCmdAnswer);
+                    destOnStore.processEvent(Event.OperationSucceeded, copyCmdAnswer);
 
                     CopyCommand cmd = new CopyCommand(destOnStore.getTO(), destData.getTO(), primaryStorageDownloadWait,
                             VirtualMachineManager.ExecuteInSequence.value());
@@ -1271,7 +1271,7 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy {
 
                 try {
                     if (StringUtils.isEmpty(errMsg)) {
-                        snapshotInfo.processEvent(Event.OperationSuccessed);
+                        snapshotInfo.processEvent(Event.OperationSucceeded);
                     }
                     else {
                         snapshotInfo.processEvent(Event.OperationFailed);
@@ -1404,7 +1404,7 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy {
 
             try {
                 if (StringUtils.isEmpty(errMsg)) {
-                    snapshotInfo.processEvent(Event.OperationSuccessed);
+                    snapshotInfo.processEvent(Event.OperationSucceeded);
                 }
                 else {
                     snapshotInfo.processEvent(Event.OperationFailed);
@@ -2366,7 +2366,7 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy {
 
                 _volumeDao.update(volumeVO.getId(), volumeVO);
 
-                _volumeService.copyPoliciesBetweenVolumesAndDestroySourceVolumeAfterMigration(Event.OperationSuccessed, null, srcVolumeInfo, destVolumeInfo, false);
+                _volumeService.copyPoliciesBetweenVolumesAndDestroySourceVolumeAfterMigration(Event.OperationSucceeded, null, srcVolumeInfo, destVolumeInfo, false);
 
                 // Update the volume ID for snapshots on secondary storage
                 if (!_snapshotDao.listByVolumeId(srcVolumeInfo.getId()).isEmpty()) {
@@ -2704,7 +2704,7 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy {
 
                 try {
                     if (StringUtils.isEmpty(errMsg)) {
-                        volumeInfo.processEvent(Event.OperationSuccessed);
+                        volumeInfo.processEvent(Event.OperationSucceeded);
                     }
                     else {
                         volumeInfo.processEvent(Event.OperationFailed);
diff --git a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/SecondaryStorageServiceImpl.java b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/SecondaryStorageServiceImpl.java
index 502bbaf9e49..641a2a40dcd 100644
--- a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/SecondaryStorageServiceImpl.java
+++ b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/SecondaryStorageServiceImpl.java
@@ -257,9 +257,9 @@ public class SecondaryStorageServiceImpl implements SecondaryStorageService {
                 }
             } else {
                 if (destData instanceof  VolumeInfo) {
-                    ((VolumeInfo) destData).processEventOnly(ObjectInDataStoreStateMachine.Event.OperationSuccessed, answer);
+                    ((VolumeInfo) destData).processEventOnly(ObjectInDataStoreStateMachine.Event.OperationSucceeded, answer);
                 } else {
-                    destData.processEvent(ObjectInDataStoreStateMachine.Event.OperationSuccessed, answer);
+                    destData.processEvent(ObjectInDataStoreStateMachine.Event.OperationSucceeded, answer);
                 }
                 updateDataObject(srcData, destData);
                 logger.debug("Deleting source data");
diff --git a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
index 0e7acd763e0..4b82bedefeb 100644
--- a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
+++ b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
@@ -671,7 +671,7 @@ public class TemplateServiceImpl implements TemplateService {
         TemplateApiResult res = new TemplateApiResult(tmplt);
         if (result.isSuccess()) {
             logger.info("Copied template [{}] to image store [{}].", tmplt.getUniqueName(), tmplt.getDataStore().getName());
-            tmplt.processEvent(Event.OperationSuccessed, result.getAnswer());
+            tmplt.processEvent(Event.OperationSucceeded, result.getAnswer());
             publishTemplateCreation(tmplt);
         } else {
             logger.warn("Failed to copy template [{}] to image store [{}].", tmplt.getUniqueName(), tmplt.getDataStore().getName());
@@ -824,7 +824,7 @@ public class TemplateServiceImpl implements TemplateService {
         }
 
         try {
-            template.processEvent(ObjectInDataStoreStateMachine.Event.OperationSuccessed);
+            template.processEvent(ObjectInDataStoreStateMachine.Event.OperationSucceeded);
         } catch (Exception e) {
             result.setResult(e.toString());
             if (parentCallback != null) {
@@ -1033,7 +1033,7 @@ public class TemplateServiceImpl implements TemplateService {
         CommandResult result = callback.getResult();
         TemplateObject vo = context.getTemplate();
         if (result.isSuccess()) {
-            vo.processEvent(Event.OperationSuccessed);
+            vo.processEvent(Event.OperationSucceeded);
         } else {
             vo.processEvent(Event.OperationFailed);
         }
@@ -1093,7 +1093,7 @@ public class TemplateServiceImpl implements TemplateService {
                 // no change to existing template_store_ref, will try to re-sync later if other call triggers this sync operation, like copy template
             } else {
                 // this will update install path properly, next time it will not sync anymore.
-                destTemplate.processEvent(Event.OperationSuccessed, result.getAnswer());
+                destTemplate.processEvent(Event.OperationSucceeded, result.getAnswer());
             }
             future.complete(res);
         } catch (Exception e) {
@@ -1273,7 +1273,7 @@ public class TemplateServiceImpl implements TemplateService {
                 res.setResult(result.getResult());
                 destTemplate.processEvent(Event.OperationFailed);
             } else {
-                destTemplate.processEvent(Event.OperationSuccessed, result.getAnswer());
+                destTemplate.processEvent(Event.OperationSucceeded, result.getAnswer());
             }
             future.complete(res);
         } catch (Exception e) {
@@ -1298,7 +1298,7 @@ public class TemplateServiceImpl implements TemplateService {
                 res.setResult(result.getResult());
                 destTemplate.processEvent(Event.OperationFailed);
             } else {
-                destTemplate.processEvent(Event.OperationSuccessed, result.getAnswer());
+                destTemplate.processEvent(Event.OperationSucceeded, result.getAnswer());
             }
             future.complete(res);
         } catch (Exception e) {
@@ -1384,7 +1384,7 @@ public class TemplateServiceImpl implements TemplateService {
         TemplateApiResult dataDiskTemplateResult = new TemplateApiResult((TemplateObject)dataDiskTemplate);
         try {
             if (result.isSuccess()) {
-                dataDiskTemplate.processEvent(Event.OperationSuccessed, result.getAnswer());
+                dataDiskTemplate.processEvent(Event.OperationSucceeded, result.getAnswer());
             } else {
                 dataDiskTemplate.processEvent(Event.OperationFailed);
                 dataDiskTemplateResult.setResult(result.getResult());
diff --git a/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/SnapshotTest.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/SnapshotTest.java
index f07866c8353..605a5ffa8f0 100644
--- a/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/SnapshotTest.java
+++ b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/SnapshotTest.java
@@ -269,7 +269,7 @@ public class SnapshotTest extends CloudStackTestNGBase {
         to.setSize(1000L);
         CopyCmdAnswer answer = new CopyCmdAnswer(to);
         templateOnStore.processEvent(Event.CreateOnlyRequested);
-        templateOnStore.processEvent(Event.OperationSuccessed, answer);
+        templateOnStore.processEvent(Event.OperationSucceeded, answer);
 
     }
 
diff --git a/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeTest.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeTest.java
index 86421742f83..a2266020047 100644
--- a/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeTest.java
+++ b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeTest.java
@@ -244,7 +244,7 @@ public class VolumeTest extends CloudStackTestNGBase {
         to.setSize(100L);
         CopyCmdAnswer answer = new CopyCmdAnswer(to);
         templateOnStore.processEvent(Event.CreateOnlyRequested);
-        templateOnStore.processEvent(Event.OperationSuccessed, answer);
+        templateOnStore.processEvent(Event.OperationSucceeded, answer);
 
     }
 
diff --git a/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeTestVmware.java b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeTestVmware.java
index c0f43da122b..b2966d6f5c1 100644
--- a/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeTestVmware.java
+++ b/engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeTestVmware.java
@@ -247,7 +247,7 @@ public class VolumeTestVmware extends CloudStackTestNGBase {
         to.setPath(this.getImageInstallPath());
         CopyCmdAnswer answer = new CopyCmdAnswer(to);
         templateOnStore.processEvent(Event.CreateOnlyRequested);
-        templateOnStore.processEvent(Event.OperationSuccessed, answer);
+        templateOnStore.processEvent(Event.OperationSucceeded, answer);
 
     }
 
diff --git a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategy.java b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategy.java
index c1981941ac0..ee2c1f81d46 100644
--- a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategy.java
+++ b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategy.java
@@ -148,7 +148,7 @@ public class DefaultSnapshotStrategy extends SnapshotStrategyBase {
 
                 CreateObjectAnswer createSnapshotAnswer = new CreateObjectAnswer(snapTO);
 
-                snapshotOnImageStore.processEvent(Event.OperationSuccessed, createSnapshotAnswer);
+                snapshotOnImageStore.processEvent(Event.OperationSucceeded, createSnapshotAnswer);
                 SnapshotObject snapObj = castSnapshotInfoToSnapshotObject(snapshot);
                 try {
                     snapObj.processEvent(Snapshot.Event.OperationNotPerformed);
diff --git a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java
index 10740289c8f..bc2d070eb4b 100644
--- a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java
+++ b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java
@@ -227,7 +227,7 @@ public class SnapshotServiceImpl implements SnapshotService {
         }
 
         try {
-            snapshot.processEvent(Event.OperationSuccessed, result.getAnswer());
+            snapshot.processEvent(Event.OperationSucceeded, result.getAnswer());
             snapshot.processEvent(Snapshot.Event.OperationSucceeded);
         } catch (Exception e) {
             logger.debug("Failed to create snapshot: ", e);
@@ -515,7 +515,7 @@ public class SnapshotServiceImpl implements SnapshotService {
 
         try {
             CopyCmdAnswer copyCmdAnswer = (CopyCmdAnswer)result.getAnswer();
-            destSnapshot.processEvent(Event.OperationSuccessed, copyCmdAnswer);
+            destSnapshot.processEvent(Event.OperationSucceeded, copyCmdAnswer);
             srcSnapshot.processEvent(Snapshot.Event.OperationSucceeded);
             snapResult = new SnapshotResult(_snapshotFactory.getSnapshot(destSnapshot.getId(), destSnapshot.getDataStore()), copyCmdAnswer);
             future.complete(snapResult);
@@ -540,7 +540,7 @@ public class SnapshotServiceImpl implements SnapshotService {
         }
         try {
             Answer answer = result.getAnswer();
-            destSnapshot.processEvent(Event.OperationSuccessed);
+            destSnapshot.processEvent(Event.OperationSucceeded);
             snapResult = new SnapshotResult(_snapshotFactory.getSnapshot(destSnapshot.getId(), destSnapshot.getDataStore()), answer);
             future.complete(snapResult);
         } catch (Exception e) {
@@ -583,7 +583,7 @@ public class SnapshotServiceImpl implements SnapshotService {
                 res = new SnapshotResult(context.snapshot, null);
                 res.setResult(result.getResult());
             } else {
-                snapshot.processEvent(ObjectInDataStoreStateMachine.Event.OperationSuccessed);
+                snapshot.processEvent(ObjectInDataStoreStateMachine.Event.OperationSucceeded);
                 res = new SnapshotResult(context.snapshot, null);
             }
         } catch (Exception e) {
@@ -803,7 +803,7 @@ public class SnapshotServiceImpl implements SnapshotService {
                 // no change to existing snapshot_store_ref, will try to re-sync later if other call triggers this sync operation
             } else {
                 // this will update install path properly, next time it will not sync anymore.
-                destSnapshot.processEvent(Event.OperationSuccessed, result.getAnswer());
+                destSnapshot.processEvent(Event.OperationSucceeded, result.getAnswer());
             }
             future.complete(res);
         } catch (Exception e) {
@@ -833,7 +833,7 @@ public class SnapshotServiceImpl implements SnapshotService {
                 try {
                     SnapshotObject srcSnapshot = (SnapshotObject)snapshot;
                     srcSnapshot.processEvent(Event.DestroyRequested);
-                    srcSnapshot.processEvent(Event.OperationSuccessed);
+                    srcSnapshot.processEvent(Event.OperationSucceeded);
 
                     srcSnapshot.processEvent(Snapshot.Event.OperationFailed);
 
diff --git a/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java
index 7c1cbb55b3b..3f925f08322 100644
--- a/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java
+++ b/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java
@@ -178,7 +178,7 @@ public class DataObjectManagerImpl implements DataObjectManager {
         }
 
         try {
-            objectInDataStoreMgr.update(objInStrore, ObjectInDataStoreStateMachine.Event.OperationSuccessed);
+            objectInDataStoreMgr.update(objInStrore, ObjectInDataStoreStateMachine.Event.OperationSucceeded);
         } catch (NoTransitionException e) {
             try {
                 objectInDataStoreMgr.update(objInStrore, ObjectInDataStoreStateMachine.Event.OperationFailed);
@@ -267,7 +267,7 @@ public class DataObjectManagerImpl implements DataObjectManager {
         }
 
         try {
-            objectInDataStoreMgr.update(destObj, ObjectInDataStoreStateMachine.Event.OperationSuccessed);
+            objectInDataStoreMgr.update(destObj, ObjectInDataStoreStateMachine.Event.OperationSucceeded);
         } catch (NoTransitionException e) {
             logger.debug("Failed to update copying state: ", e);
             try {
@@ -341,7 +341,7 @@ public class DataObjectManagerImpl implements DataObjectManager {
 
         } else {
             try {
-                objectInDataStoreMgr.update(destObj, Event.OperationSuccessed);
+                objectInDataStoreMgr.update(destObj, Event.OperationSucceeded);
             } catch (NoTransitionException e) {
                 logger.debug("delete failed", e);
             } catch (ConcurrentOperationException e) {
@@ -365,7 +365,7 @@ public class DataObjectManagerImpl implements DataObjectManager {
             event = ObjectInDataStoreStateMachine.Event.CreateRequested;
             objectInDataStoreMgr.update(objInStore, event);
 
-            objectInDataStoreMgr.update(objInStore, ObjectInDataStoreStateMachine.Event.OperationSuccessed);
+            objectInDataStoreMgr.update(objInStore, ObjectInDataStoreStateMachine.Event.OperationSucceeded);
         } catch (NoTransitionException e) {
             logger.debug("Failed to update state", e);
             throw new CloudRuntimeException("Failed to update state", e);
diff --git a/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java
index e5c8c69ddf5..33e5e5f657e 100644
--- a/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java
+++ b/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java
@@ -99,27 +99,27 @@ public class ObjectInDataStoreManagerImpl implements ObjectInDataStoreManager {
         stateMachines.addTransition(State.Allocated, Event.CreateOnlyRequested, State.Creating);
         stateMachines.addTransition(State.Allocated, Event.DestroyRequested, State.Destroying);
         stateMachines.addTransition(State.Allocated, Event.OperationFailed, State.Failed);
-        stateMachines.addTransition(State.Allocated, Event.OperationSuccessed, State.Ready);
+        stateMachines.addTransition(State.Allocated, Event.OperationSucceeded, State.Ready);
         stateMachines.addTransition(State.Creating, Event.OperationFailed, State.Allocated);
-        stateMachines.addTransition(State.Creating, Event.OperationSuccessed, State.Ready);
+        stateMachines.addTransition(State.Creating, Event.OperationSucceeded, State.Ready);
         stateMachines.addTransition(State.Ready, Event.CopyingRequested, State.Copying);
-        stateMachines.addTransition(State.Copying, Event.OperationSuccessed, State.Ready);
+        stateMachines.addTransition(State.Copying, Event.OperationSucceeded, State.Ready);
         stateMachines.addTransition(State.Copying, Event.OperationFailed, State.Ready);
         stateMachines.addTransition(State.Ready, Event.DestroyRequested, State.Destroying);
         stateMachines.addTransition(State.Destroying, Event.DestroyRequested, State.Destroying);
-        stateMachines.addTransition(State.Destroying, Event.OperationSuccessed, State.Destroyed);
+        stateMachines.addTransition(State.Destroying, Event.OperationSucceeded, State.Destroyed);
         stateMachines.addTransition(State.Destroying, Event.OperationFailed, State.Destroying);
         stateMachines.addTransition(State.Failed, Event.DestroyRequested, State.Destroying);
         // TODO: further investigate why an extra event is sent when it is
         // already Ready for DownloadListener
-        stateMachines.addTransition(State.Ready, Event.OperationSuccessed, State.Ready);
+        stateMachines.addTransition(State.Ready, Event.OperationSucceeded, State.Ready);
         // State transitions for data object migration
         stateMachines.addTransition(State.Ready, Event.MigrateDataRequested, State.Migrating);
         stateMachines.addTransition(State.Ready, Event.CopyRequested, State.Copying);
         stateMachines.addTransition(State.Allocated, Event.MigrateDataRequested, State.Migrating);
         stateMachines.addTransition(State.Migrating, Event.MigrationFailed, State.Failed);
         stateMachines.addTransition(State.Migrating, Event.MigrationSucceeded, State.Destroyed);
-        stateMachines.addTransition(State.Migrating, Event.OperationSuccessed, State.Ready);
+        stateMachines.addTransition(State.Migrating, Event.OperationSucceeded, State.Ready);
         stateMachines.addTransition(State.Migrating, Event.OperationFailed, State.Ready);
         stateMachines.addTransition(State.Hidden, Event.DestroyRequested, State.Destroying);
     }
@@ -360,9 +360,7 @@ public class ObjectInDataStoreManagerImpl implements ObjectInDataStoreManager {
                     break;
             }
         } else if (data.getType() == DataObjectType.TEMPLATE && data.getDataStore().getRole() == DataStoreRole.Primary) {
-
             result = this.stateMachines.transitTo(obj, event, null, templatePoolDao);
-
         } else if (data.getType() == DataObjectType.SNAPSHOT && data.getDataStore().getRole() == DataStoreRole.Primary) {
             result = this.stateMachines.transitTo(obj, event, null, snapshotDataStoreDao);
         } else {
@@ -422,7 +420,5 @@ public class ObjectInDataStoreManagerImpl implements ObjectInDataStoreManager {
         }
 
         return vo;
-
     }
-
 }
diff --git a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java
index 31aaf7dc856..43218b3f6a0 100644
--- a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java
+++ b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java
@@ -427,7 +427,7 @@ public class VolumeObject implements VolumeInfo {
         }
         mapOfEvents.put(ObjectInDataStoreStateMachine.Event.DestroyRequested, Volume.Event.DestroyRequested);
         mapOfEvents.put(ObjectInDataStoreStateMachine.Event.ExpungeRequested, Volume.Event.ExpungingRequested);
-        mapOfEvents.put(ObjectInDataStoreStateMachine.Event.OperationSuccessed, Volume.Event.OperationSucceeded);
+        mapOfEvents.put(ObjectInDataStoreStateMachine.Event.OperationSucceeded, Volume.Event.OperationSucceeded);
         mapOfEvents.put(ObjectInDataStoreStateMachine.Event.MigrationCopySucceeded, Volume.Event.MigrationCopySucceeded);
         mapOfEvents.put(ObjectInDataStoreStateMachine.Event.OperationFailed, Volume.Event.OperationFailed);
         mapOfEvents.put(ObjectInDataStoreStateMachine.Event.MigrationCopyFailed, Volume.Event.MigrationCopyFailed);
diff --git a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
index 52ad19dd468..c59ae5b18e3 100644
--- a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
+++ b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
@@ -324,7 +324,7 @@ public class VolumeServiceImpl implements VolumeService {
         DataObject vo = context.getVolume();
         String errMsg = null;
         if (result.isSuccess()) {
-            vo.processEvent(Event.OperationSuccessed, result.getAnswer());
+            vo.processEvent(Event.OperationSucceeded, result.getAnswer());
         } else {
             vo.processEvent(Event.OperationFailed);
             errMsg = result.getResult();
@@ -485,7 +485,7 @@ public class VolumeServiceImpl implements VolumeService {
         VolumeApiResult apiResult = new VolumeApiResult(vo);
         try {
             if (result.isSuccess()) {
-                vo.processEvent(Event.OperationSuccessed);
+                vo.processEvent(Event.OperationSucceeded);
 
                 if (vo.getPassphraseId() != null) {
                     vo.deletePassphrase();
@@ -722,7 +722,7 @@ public class VolumeServiceImpl implements VolumeService {
         VolumeApiResult res = new VolumeApiResult(volumeInfo);
 
         if (result.isSuccess()) {
-            // volumeInfo.processEvent(Event.OperationSuccessed, result.getAnswer());
+            // volumeInfo.processEvent(Event.OperationSucceeded, result.getAnswer());
 
             VolumeVO volume = volDao.findById(volumeInfo.getId());
             CopyCmdAnswer answer = (CopyCmdAnswer)result.getAnswer();
@@ -759,7 +759,7 @@ public class VolumeServiceImpl implements VolumeService {
 
         if (result.isSuccess()) {
             ((TemplateObject)templateOnPrimaryStoreObj).setInstallPath(result.getPath());
-            templateOnPrimaryStoreObj.processEvent(Event.OperationSuccessed, result.getAnswer());
+            templateOnPrimaryStoreObj.processEvent(Event.OperationSucceeded, result.getAnswer());
         } else {
             templateOnPrimaryStoreObj.processEvent(Event.OperationFailed);
         }
@@ -779,7 +779,7 @@ public class VolumeServiceImpl implements VolumeService {
         DataObject templateOnPrimaryStoreObj = context.destObj;
 
         if (result.isSuccess()) {
-            templateOnPrimaryStoreObj.processEvent(Event.OperationSuccessed, result.getAnswer());
+            templateOnPrimaryStoreObj.processEvent(Event.OperationSucceeded, result.getAnswer());
         } else {
             templateOnPrimaryStoreObj.processEvent(Event.OperationFailed);
         }
@@ -803,7 +803,7 @@ public class VolumeServiceImpl implements VolumeService {
             return null;
         }
 
-        templateOnPrimaryStoreObj.processEvent(Event.OperationSuccessed, result.getAnswer());
+        templateOnPrimaryStoreObj.processEvent(Event.OperationSucceeded, result.getAnswer());
         createVolumeFromBaseImageAsync(context.volume, templateOnPrimaryStoreObj, context.dataStore, future);
         return null;
     }
@@ -854,7 +854,7 @@ public class VolumeServiceImpl implements VolumeService {
         String deployAsIsConfiguration = context.deployAsIsConfiguration;
 
         if (result.isSuccess()) {
-            vo.processEvent(Event.OperationSuccessed, result.getAnswer());
+            vo.processEvent(Event.OperationSucceeded, result.getAnswer());
         } else {
 
             vo.processEvent(Event.OperationFailed);
@@ -909,7 +909,7 @@ public class VolumeServiceImpl implements VolumeService {
             }
 
             volDao.update(volume.getId(), volume);
-            vo.processEvent(Event.OperationSuccessed);
+            vo.processEvent(Event.OperationSucceeded);
         } else {
             volResult.setResult(result.getResult());
 
@@ -973,7 +973,7 @@ public class VolumeServiceImpl implements VolumeService {
                 throw new CloudRuntimeException(String.format("Unable to create template %s on primary storage %s: %s", templateOnPrimary.getImage(), destPrimaryDataStore, errMesg));
             }
 
-            templateOnPrimary.processEvent(Event.OperationSuccessed);
+            templateOnPrimary.processEvent(Event.OperationSucceeded);
 
         } catch (Throwable e) {
             logger.debug("Failed to create template volume on storage", e);
@@ -1446,7 +1446,7 @@ public class VolumeServiceImpl implements VolumeService {
                         logger.debug("Failed to prepare ready bypassed template: {} on primary storage: {}", srcTemplateInfo, templateOnPrimary);
                         throw new CloudRuntimeException(String.format("Failed to prepare ready bypassed template: %s on primary storage: %s", srcTemplateInfo, templateOnPrimary));
                     }
-                    templateOnPrimary.processEvent(Event.OperationSuccessed);
+                    templateOnPrimary.processEvent(Event.OperationSucceeded);
                     return templateOnPrimaryNow;
                 } finally {
                     revokeAccess(templateOnPrimary, destHost, destPrimaryDataStore);
@@ -1701,7 +1701,7 @@ public class VolumeServiceImpl implements VolumeService {
             apiResult.setResult(result.getResult());
             event = Event.OperationFailed;
         } else {
-            event = Event.OperationSuccessed;
+            event = Event.OperationSucceeded;
         }
 
         try {
@@ -1807,8 +1807,8 @@ public class VolumeServiceImpl implements VolumeService {
                 return null;
             }
 
-            srcVolume.processEvent(Event.OperationSuccessed);
-            destVolume.processEvent(Event.OperationSuccessed, result.getAnswer());
+            srcVolume.processEvent(Event.OperationSucceeded);
+            destVolume.processEvent(Event.OperationSucceeded, result.getAnswer());
             srcVolume.getDataStore().delete(srcVolume);
             future.complete(res);
         } catch (Exception e) {
@@ -1858,8 +1858,8 @@ public class VolumeServiceImpl implements VolumeService {
                 res.setResult(result.getResult());
                 future.complete(res);
             } else {
-                srcVolume.processEvent(Event.OperationSuccessed); // back to Ready state in Volume table
-                destVolume.processEventOnly(Event.OperationSuccessed, result.getAnswer());
+                srcVolume.processEvent(Event.OperationSucceeded); // back to Ready state in Volume table
+                destVolume.processEventOnly(Event.OperationSucceeded, result.getAnswer());
                 future.complete(res);
             }
         } catch (Exception e) {
@@ -1941,7 +1941,7 @@ public class VolumeServiceImpl implements VolumeService {
                 if (destVolume.getStoragePoolType() == StoragePoolType.PowerFlex) {
                     logger.info("Dest volume {} can be removed", destVolume);
                     destVolume.processEvent(Event.ExpungeRequested);
-                    destVolume.processEvent(Event.OperationSuccessed);
+                    destVolume.processEvent(Event.OperationSucceeded);
                     volDao.remove(destVolume.getId());
                     future.complete(res);
                     return null;
@@ -1974,7 +1974,7 @@ public class VolumeServiceImpl implements VolumeService {
 
     protected boolean destroySourceVolumeAfterMigration(Event destinationEvent, Answer destinationEventAnswer, VolumeInfo sourceVolume,
       VolumeInfo destinationVolume, boolean retryExpungeVolumeAsync) {
-        sourceVolume.processEvent(Event.OperationSuccessed);
+        sourceVolume.processEvent(Event.OperationSucceeded);
         destinationVolume.processEvent(destinationEvent, destinationEventAnswer);
 
         VolumeVO sourceVolumeVo = ((VolumeObject) sourceVolume).getVolume();
@@ -1990,7 +1990,7 @@ public class VolumeServiceImpl implements VolumeService {
             if (sourceVolume.getStoragePoolType() == StoragePoolType.PowerFlex) {
                 logger.info("Source volume {} can be removed.", sourceVolumeVo);
                 sourceVolume.processEvent(Event.ExpungeRequested);
-                sourceVolume.processEvent(Event.OperationSuccessed);
+                sourceVolume.processEvent(Event.OperationSucceeded);
                 volDao.remove(sourceVolume.getId());
                 return true;
             }
@@ -2085,7 +2085,7 @@ public class VolumeServiceImpl implements VolumeService {
                 logger.debug("Failed to create dest volume {}, volume can be removed", destVolume);
                 destroyVolume(destVolume.getId());
                 destVolume.processEvent(Event.ExpungeRequested);
-                destVolume.processEvent(Event.OperationSuccessed);
+                destVolume.processEvent(Event.OperationSucceeded);
                 volDao.remove(destVolume.getId());
                 throw new CloudRuntimeException("Creation of a dest volume failed: " + createVolumeResult.getResult());
             }
@@ -2174,7 +2174,7 @@ public class VolumeServiceImpl implements VolumeService {
                     logger.debug("failed to clean up managed volume on storage", e);
                 }
             } else {
-                srcVolume.processEvent(Event.OperationSuccessed);
+                srcVolume.processEvent(Event.OperationSucceeded);
                 destVolume.processEvent(Event.MigrationCopySucceeded, result.getAnswer());
                 volDao.updateUuid(srcVolume.getId(), destVolume.getId());
                 volDao.detachVolume(srcVolume.getId());
@@ -2294,7 +2294,7 @@ public class VolumeServiceImpl implements VolumeService {
                 srcVolume.processEvent(Event.OperationFailed);
                 future.complete(res);
             } else {
-                srcVolume.processEvent(Event.OperationSuccessed);
+                srcVolume.processEvent(Event.OperationSucceeded);
                 if (srcVolume.getStoragePoolType() == StoragePoolType.PowerFlex) {
                     future.complete(res);
                     return null;
@@ -2381,7 +2381,7 @@ public class VolumeServiceImpl implements VolumeService {
                 for (Map.Entry<VolumeInfo, DataStore> entry : volumeToPool.entrySet()) {
                     VolumeInfo volume = entry.getKey();
                     snapshotMgr.cleanupSnapshotsByVolume(volume.getId());
-                    volume.processEvent(Event.OperationSuccessed);
+                    volume.processEvent(Event.OperationSucceeded);
                 }
                 future.complete(res);
             }
@@ -2449,7 +2449,7 @@ public class VolumeServiceImpl implements VolumeService {
                 }
 
             } else {
-                vo.processEvent(Event.OperationSuccessed, result.getAnswer());
+                vo.processEvent(Event.OperationSucceeded, result.getAnswer());
 
                 if (vo.getSize() != null) {
                     // publish usage events
@@ -2569,7 +2569,7 @@ public class VolumeServiceImpl implements VolumeService {
         }
 
         try {
-            volume.processEvent(Event.OperationSuccessed);
+            volume.processEvent(Event.OperationSucceeded);
         } catch (Exception e) {
             logger.debug("Failed to change volume state (after resize success)", e);
         }
@@ -2658,7 +2658,7 @@ public class VolumeServiceImpl implements VolumeService {
 
                                 if (volume.getState() == State.NotUploaded || volume.getState() == State.UploadInProgress) {
                                     VolumeObject volObj = (VolumeObject)volFactory.getVolume(volume.getId());
-                                    volObj.processEvent(Event.OperationSuccessed);
+                                    volObj.processEvent(Event.OperationSucceeded);
                                 }
 
                                 if (volInfo.getSize() > 0) {
diff --git a/engine/storage/volume/src/test/java/org/apache/cloudstack/storage/volume/VolumeObjectTest.java b/engine/storage/volume/src/test/java/org/apache/cloudstack/storage/volume/VolumeObjectTest.java
index 54aaecb0c09..fc79e32d114 100644
--- a/engine/storage/volume/src/test/java/org/apache/cloudstack/storage/volume/VolumeObjectTest.java
+++ b/engine/storage/volume/src/test/java/org/apache/cloudstack/storage/volume/VolumeObjectTest.java
@@ -156,7 +156,7 @@ public class VolumeObjectTest extends TestCase{
         expectedResult.put(ObjectInDataStoreStateMachine.Event.MigrationRequested, Volume.Event.CopyRequested);
         expectedResult.put(ObjectInDataStoreStateMachine.Event.DestroyRequested, Volume.Event.DestroyRequested);
         expectedResult.put(ObjectInDataStoreStateMachine.Event.ExpungeRequested, Volume.Event.ExpungingRequested);
-        expectedResult.put(ObjectInDataStoreStateMachine.Event.OperationSuccessed, Volume.Event.OperationSucceeded);
+        expectedResult.put(ObjectInDataStoreStateMachine.Event.OperationSucceeded, Volume.Event.OperationSucceeded);
         expectedResult.put(ObjectInDataStoreStateMachine.Event.MigrationCopySucceeded, Volume.Event.MigrationCopySucceeded);
         expectedResult.put(ObjectInDataStoreStateMachine.Event.OperationFailed, Volume.Event.OperationFailed);
         expectedResult.put(ObjectInDataStoreStateMachine.Event.MigrationCopyFailed, Volume.Event.MigrationCopyFailed);
@@ -177,7 +177,7 @@ public class VolumeObjectTest extends TestCase{
         expectedResult.put(ObjectInDataStoreStateMachine.Event.MigrationCopyRequested, Volume.Event.MigrationCopyRequested);
         expectedResult.put(ObjectInDataStoreStateMachine.Event.DestroyRequested, Volume.Event.DestroyRequested);
         expectedResult.put(ObjectInDataStoreStateMachine.Event.ExpungeRequested, Volume.Event.ExpungingRequested);
-        expectedResult.put(ObjectInDataStoreStateMachine.Event.OperationSuccessed, Volume.Event.OperationSucceeded);
+        expectedResult.put(ObjectInDataStoreStateMachine.Event.OperationSucceeded, Volume.Event.OperationSucceeded);
         expectedResult.put(ObjectInDataStoreStateMachine.Event.MigrationCopySucceeded, Volume.Event.MigrationCopySucceeded);
         expectedResult.put(ObjectInDataStoreStateMachine.Event.OperationFailed, Volume.Event.OperationFailed);
         expectedResult.put(ObjectInDataStoreStateMachine.Event.MigrationCopyFailed, Volume.Event.MigrationCopyFailed);
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateVolumeCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateVolumeCommandWrapper.java
index 7ae697a0ae5..85574c44741 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateVolumeCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateVolumeCommandWrapper.java
@@ -44,6 +44,7 @@ import org.apache.cloudstack.storage.datastore.client.ScaleIOGatewayClient;
 import org.apache.cloudstack.storage.datastore.util.ScaleIOUtil;
 import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
 import org.apache.cloudstack.storage.to.VolumeObjectTO;
+import org.apache.cloudstack.utils.security.ParserUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.libvirt.Connect;
@@ -237,7 +238,7 @@ public class LibvirtMigrateVolumeCommandWrapper extends CommandWrapper<MigrateVo
 
     private String generateDestinationDiskLabel(String diskXml) throws ParserConfigurationException, IOException, SAXException {
 
-        DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
+        DocumentBuilderFactory dbFactory = ParserUtils.getSaferDocumentBuilderFactory();
         DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
         Document doc = dBuilder.parse(new ByteArrayInputStream(diskXml.getBytes("UTF-8")));
         doc.getDocumentElement().normalize();
@@ -251,7 +252,7 @@ public class LibvirtMigrateVolumeCommandWrapper extends CommandWrapper<MigrateVo
     protected String generateDestinationDiskXML(Domain dm, String srcVolumeId, String diskFilePath, String destSecretUUID) throws LibvirtException, ParserConfigurationException, IOException, TransformerException, SAXException {
         final String domXml = dm.getXMLDesc(0);
 
-        DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
+        DocumentBuilderFactory dbFactory = ParserUtils.getSaferDocumentBuilderFactory();
         DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
         Document doc = dBuilder.parse(new ByteArrayInputStream(domXml.getBytes("UTF-8")));
         doc.getDocumentElement().normalize();
diff --git a/plugins/storage/volume/linstor/CHANGELOG.md b/plugins/storage/volume/linstor/CHANGELOG.md
index 337f7786db9..72f0a56697b 100644
--- a/plugins/storage/volume/linstor/CHANGELOG.md
+++ b/plugins/storage/volume/linstor/CHANGELOG.md
@@ -24,22 +24,24 @@ All notable changes to Linstor CloudStack plugin will be documented in this file
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2025-12-18]
+
+### Changed
+- Provide /dev/drbd/by-res/ resource paths to CloudStack for usage.
+
 ## [2025-10-03]
 
 ### Changed
-
 - Revert qcow2 snapshot now use sparse/discard options to convert on thin devices.
 
 ## [2025-08-05]
 
 ### Fixed
-
 - getVolumeStats wasn't correctly working if multiple Linstor clusters/primary storages are used.
 
 ## [2025-07-01]
 
 ### Fixed
-
 - Regression in 4.19.3 and 4.21.0 with templates from snapshots
 
 ## [2025-05-07]
@@ -50,25 +52,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [2025-03-13]
 
 ### Fixed
-
 - Implemented missing delete datastore, to correctly cleanup on datastore removal
 
 ## [2025-02-21]
 
 ### Fixed
-
 - Always try to delete cs-...-rst resource before doing a snapshot backup
 
 ## [2025-01-27]
 
 ### Fixed
-
 - Use of multiple primary storages on the same linstor controller
 
 ## [2025-01-20]
 
 ### Fixed
-
 - Volume snapshots on zfs used the wrong dataset path to hide/unhide snapdev
 
 ## [2024-12-19]
@@ -79,13 +77,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [2024-12-13]
 
 ### Fixed
-
 - Linstor heartbeat check now also ask linstor-controller if there is no connection between nodes
 
 ## [2024-12-11]
 
 ### Fixed
-
 - Only set allow-two-primaries if a live migration is performed
 
 ## [2024-10-28]
@@ -98,17 +94,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [2024-10-14]
 
 ### Added
-
 - Support for ISO direct download to primary storage
 
 ## [2024-10-04]
 
 ### Added
-
 - Enable qemu discard="unmap" for Linstor block disks
 
 ## [2024-08-27]
 
 ### Changed
-
 - Allow two primaries(+protocol c) is now set on resource-connection level instead of rd
diff --git a/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java b/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
index a1ba41b1d6e..2b11c83c802 100644
--- a/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
+++ b/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
@@ -233,7 +233,7 @@ public class LinstorStorageAdaptor implements StorageAdaptor {
             makeResourceAvailable(api, foundRscName, false);
 
             if (!resources.isEmpty() && !resources.get(0).getVolumes().isEmpty()) {
-                final String devPath = resources.get(0).getVolumes().get(0).getDevicePath();
+                final String devPath = LinstorUtil.getDevicePathFromResource(resources.get(0));
                 logger.info("Linstor: Created drbd device: " + devPath);
                 final KVMPhysicalDisk kvmDisk = new KVMPhysicalDisk(devPath, name, pool);
                 kvmDisk.setFormat(QemuImg.PhysicalDiskFormat.RAW);
@@ -456,8 +456,9 @@ public class LinstorStorageAdaptor implements StorageAdaptor {
     private Optional<ResourceWithVolumes> getResourceByPathOrName(
             final List<ResourceWithVolumes> resources, String path) {
         return resources.stream()
-            .filter(rsc -> getLinstorRscName(path).equalsIgnoreCase(rsc.getName()) || rsc.getVolumes().stream()
-                .anyMatch(v -> path.equals(v.getDevicePath())))
+            .filter(rsc -> getLinstorRscName(path).equalsIgnoreCase(rsc.getName()) ||
+                    path.equals(LinstorUtil.formatDrbdByResDevicePath(rsc.getName())) ||
+                    rsc.getVolumes().stream().anyMatch(v -> path.equals(v.getDevicePath())))
             .findFirst();
     }
 
diff --git a/plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/util/LinstorUtil.java b/plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/util/LinstorUtil.java
index 9c3c9d32611..4196c12b116 100644
--- a/plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/util/LinstorUtil.java
+++ b/plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/util/LinstorUtil.java
@@ -264,6 +264,16 @@ public class LinstorUtil {
         return false;
     }
 
+    /**
+     * Format the device path for DRBD resources.
+     * @param rscName
+     * @return
+     */
+    public static String formatDrbdByResDevicePath(String rscName)
+    {
+        return String.format("/dev/drbd/by-res/%s/0", rscName);
+    }
+
     /**
      * Try to get the device path for the given resource name.
      * This could be made a bit more direct after java-linstor api is fixed for layer data subtypes.
@@ -283,12 +293,7 @@ public class LinstorUtil {
                 null);
         for (ResourceWithVolumes rsc : resources) {
             if (!rsc.getVolumes().isEmpty()) {
-                // CloudStack resource always only have 1 volume
-                String devicePath = rsc.getVolumes().get(0).getDevicePath();
-                if (devicePath != null && !devicePath.isEmpty()) {
-                    LOGGER.debug("getDevicePath: {} -> {}", rscName, devicePath);
-                    return devicePath;
-                }
+                return LinstorUtil.getDevicePathFromResource(rsc);
             }
         }
 
@@ -297,6 +302,24 @@ public class LinstorUtil {
         throw new CloudRuntimeException("Linstor: " + errMsg);
     }
 
+    /**
+     * Check if the resource has DRBD or not and deliver the correct device path.
+     * @param rsc
+     * @return
+     */
+    public static String getDevicePathFromResource(ResourceWithVolumes rsc) {
+        if (!rsc.getVolumes().isEmpty()) {
+            // CloudStack resource always only have 1 volume
+            if (rsc.getLayerObject().getDrbd() != null) {
+                return formatDrbdByResDevicePath(rsc.getName());
+            } else {
+                return rsc.getVolumes().get(0).getDevicePath();
+            }
+        }
+        throw new CloudRuntimeException(
+                String.format("getDevicePath: Resource %s/%s doesn't have volumes", rsc.getNodeName(), rsc.getName()));
+    }
+
     public static ApiCallRcList applyAuxProps(DevelopersApi api, String rscName, String dispName, String vmName)
             throws ApiException
     {
diff --git a/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/motion/StorPoolDataMotionStrategy.java b/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/motion/StorPoolDataMotionStrategy.java
index 5789ac50871..c231290bc7c 100644
--- a/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/motion/StorPoolDataMotionStrategy.java
+++ b/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/motion/StorPoolDataMotionStrategy.java
@@ -457,8 +457,8 @@ public class StorPoolDataMotionStrategy implements DataMotionStrategy {
             VolumeInfo destVolumeInfo = entry.getValue();
 
             if (success) {
-                srcVolumeInfo.processEvent(Event.OperationSuccessed);
-                destVolumeInfo.processEvent(Event.OperationSuccessed);
+                srcVolumeInfo.processEvent(Event.OperationSucceeded);
+                destVolumeInfo.processEvent(Event.OperationSucceeded);
 
                 _volumeDao.updateUuid(srcVolumeInfo.getId(), destVolumeInfo.getId());
 
diff --git a/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/snapshot/StorPoolSnapshotStrategy.java b/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/snapshot/StorPoolSnapshotStrategy.java
index 60c91bc4aed..90c750a1e25 100644
--- a/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/snapshot/StorPoolSnapshotStrategy.java
+++ b/plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/snapshot/StorPoolSnapshotStrategy.java
@@ -181,7 +181,7 @@ public class StorPoolSnapshotStrategy implements SnapshotStrategy {
             StorPoolUtil.spLog("StorpoolSnapshotStrategy.deleteSnapshot: executed successfully=%s, snapshot uuid=%s, name=%s", res, snapshotVO.getUuid(), name);
         }
         if (res) {
-            processResult(snapshotInfos, Event.OperationSuccessed);
+            processResult(snapshotInfos, Event.OperationSucceeded);
             cleanUpDestroyedRecords(snapshotId);
         } else {
             processResult(snapshotInfos, Event.OperationFailed);
@@ -261,7 +261,7 @@ public class StorPoolSnapshotStrategy implements SnapshotStrategy {
                     if (parent.getPath() != null && parent.getPath().equalsIgnoreCase(snapshot.getPath())) {
                         logger.debug("for empty delta snapshot, only mark it as destroyed in db");
                         snapshot.processEvent(Event.DestroyRequested);
-                        snapshot.processEvent(Event.OperationSuccessed);
+                        snapshot.processEvent(Event.OperationSucceeded);
                         deleted = true;
                         if (!resultIsSet) {
                             result = true;
diff --git a/server/src/main/java/com/cloud/test/DatabaseConfig.java b/server/src/main/java/com/cloud/test/DatabaseConfig.java
index 0f04cc71c1a..59187f5f077 100644
--- a/server/src/main/java/com/cloud/test/DatabaseConfig.java
+++ b/server/src/main/java/com/cloud/test/DatabaseConfig.java
@@ -427,7 +427,7 @@ public class DatabaseConfig {
         try {
             final File configFile = new File(_configFileName);
 
-            SAXParserFactory spfactory = SAXParserFactory.newInstance();
+            SAXParserFactory spfactory = ParserUtils.getSaferSAXParserFactory();
             final SAXParser saxParser = spfactory.newSAXParser();
             final DbConfigXMLHandler handler = new DbConfigXMLHandler();
             handler.setParent(this);
diff --git a/ui/src/components/view/DateTimeFilter.vue b/ui/src/components/view/DateTimeFilter.vue
index aca958f58f7..efac3b43eee 100644
--- a/ui/src/components/view/DateTimeFilter.vue
+++ b/ui/src/components/view/DateTimeFilter.vue
@@ -61,7 +61,7 @@
 
 <script>
 import { ref, reactive, toRaw } from 'vue'
-import moment from 'moment'
+import dayjs from 'dayjs'
 
 export default {
   name: 'DateTimeFilter',
@@ -84,20 +84,6 @@ export default {
       value: ''
     }
   },
-  computed: {
-    startDate () {
-      if (this.startDateProp) {
-        return moment(this.startDateProp)
-      }
-      return null
-    },
-    endDate () {
-      if (this.endDateProp) {
-        return moment(this.endDateProp)
-      }
-      return null
-    }
-  },
   data () {
     return {
       allDataIsChecked: false,
@@ -110,19 +96,27 @@ export default {
       submitButtonLabel: this.$t('label.ok')
     }
   },
-  updated () {
-    this.form.startDate = this.startDate
-    this.form.endDate = this.endDate
-  },
   created () {
     this.initForm()
   },
+  watch: {
+    startDateProp (newVal) {
+      this.form.startDate = newVal ? dayjs(newVal) : null
+    },
+    endDateProp (newVal) {
+      this.form.endDate = newVal ? dayjs(newVal) : null
+    }
+  },
   methods: {
     initForm () {
       this.formRef = ref()
+      // Use dayjs instead of moment - Ant Design Vue requires dayjs
+      const startDate = this.startDateProp ? dayjs(this.startDateProp) : null
+      const endDate = this.endDateProp ? dayjs(this.endDateProp) : null
+
       this.form = reactive({
-        startDate: this.startDate,
-        endDate: this.endDate
+        startDate: startDate,
+        endDate: endDate
       })
     },
     handleSubmit (e) {
@@ -130,7 +124,12 @@ export default {
       this.formRef.value.validate().then(() => {
         this.submitButtonLabel = this.$t('label.refresh')
         const values = toRaw(this.form)
-        this.$emit('onSubmit', values)
+        // Convert dayjs objects back to JavaScript Date objects
+        const result = {
+          startDate: values.startDate ? values.startDate.toDate() : null,
+          endDate: values.endDate ? values.endDate.toDate() : null
+        }
+        this.$emit('onSubmit', result)
       }).catch(error => {
         this.formRef.value.scrollToField(error.errorFields[0].name)
       })
diff --git a/ui/src/components/view/TestWebhookDeliveryView.vue b/ui/src/components/view/TestWebhookDeliveryView.vue
index c5b29a17e79..4e3af2304e2 100644
--- a/ui/src/components/view/TestWebhookDeliveryView.vue
+++ b/ui/src/components/view/TestWebhookDeliveryView.vue
@@ -186,7 +186,7 @@ export default {
         params.payloadUrl = this.payloadUrl
       }
       if (this.sslVerification) {
-        params.payload = this.sslVerification
+        params.sslVerification = this.sslVerification
       }
       if (this.secretKey) {
         params.secretKey = this.secretKey
diff --git a/ui/src/views/tools/CreateWebhook.vue b/ui/src/views/tools/CreateWebhook.vue
index f5165608a68..961acd20e18 100644
--- a/ui/src/views/tools/CreateWebhook.vue
+++ b/ui/src/views/tools/CreateWebhook.vue
@@ -135,7 +135,7 @@
         <test-webhook-delivery-view
           ref="dispatchview"
           :payloadUrl="form.payloadurl"
-          :sslVerification="form.sslverification"
+          :sslVerification="isPayloadUrlHttps && form.sslverification"
           :secretKey="form.secretkey"
           :showActions="!(!form.payloadurl)" />
         <a-form-item name="state" ref="state">
diff --git a/utils/src/main/java/com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java b/utils/src/main/java/com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java
index fa0f537014a..2f27d1f3a2d 100644
--- a/utils/src/main/java/com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java
+++ b/utils/src/main/java/com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java
@@ -26,6 +26,7 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.apache.logging.log4j.Logger;
+import org.apache.cloudstack.utils.security.ParserUtils;
 import org.apache.logging.log4j.LogManager;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.DOMImplementation;
@@ -67,7 +68,7 @@ public class VsmCommand {
     public static String getAddPortProfile(String name, PortProfileType type, BindingType binding, SwitchPortMode mode, int vlanid, String vdc, String espName) {
         try {
             // Create the document and root element.
-            DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+            DocumentBuilderFactory docFactory = ParserUtils.getSaferDocumentBuilderFactory();
             DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
             DOMImplementation domImpl = docBuilder.getDOMImplementation();
             Document doc = createDocument(domImpl);
@@ -100,7 +101,7 @@ public class VsmCommand {
     public static String getAddPortProfile(String name, PortProfileType type, BindingType binding, SwitchPortMode mode, int vlanid) {
         try {
             // Create the document and root element.
-            DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+            DocumentBuilderFactory docFactory = ParserUtils.getSaferDocumentBuilderFactory();
             DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
             DOMImplementation domImpl = docBuilder.getDOMImplementation();
             Document doc = createDocument(domImpl);
@@ -133,7 +134,7 @@ public class VsmCommand {
     public static String getUpdatePortProfile(String name, SwitchPortMode mode, List<Pair<VsmCommand.OperationType, String>> params) {
         try {
             // Create the document and root element.
-            DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+            DocumentBuilderFactory docFactory = ParserUtils.getSaferDocumentBuilderFactory();
             DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
             DOMImplementation domImpl = docBuilder.getDOMImplementation();
             Document doc = createDocument(domImpl);
@@ -166,7 +167,7 @@ public class VsmCommand {
     public static String getDeletePortProfile(String portName) {
         try {
             // Create the document and root element.
-            DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+            DocumentBuilderFactory docFactory = ParserUtils.getSaferDocumentBuilderFactory();
             DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
             DOMImplementation domImpl = docBuilder.getDOMImplementation();
             Document doc = createDocument(domImpl);
@@ -199,7 +200,7 @@ public class VsmCommand {
     public static String getAddPolicyMap(String name, int averageRate, int maxRate, int burstRate) {
         try {
             // Create the document and root element.
-            DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+            DocumentBuilderFactory docFactory = ParserUtils.getSaferDocumentBuilderFactory();
             DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
             DOMImplementation domImpl = docBuilder.getDOMImplementation();
             Document doc = createDocument(domImpl);
@@ -232,7 +233,7 @@ public class VsmCommand {
     public static String getDeletePolicyMap(String name) {
         try {
             // Create the document and root element.
-            DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+            DocumentBuilderFactory docFactory = ParserUtils.getSaferDocumentBuilderFactory();
             DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
             DOMImplementation domImpl = docBuilder.getDOMImplementation();
             Document doc = createDocument(domImpl);
@@ -265,7 +266,7 @@ public class VsmCommand {
     public static String getServicePolicy(String policyMap, String portProfile, boolean attach) {
         try {
             // Create the document and root element.
-            DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+            DocumentBuilderFactory docFactory = ParserUtils.getSaferDocumentBuilderFactory();
             DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
             DOMImplementation domImpl = docBuilder.getDOMImplementation();
             Document doc = createDocument(domImpl);
@@ -297,7 +298,7 @@ public class VsmCommand {
 
     public static String getPortProfile(String name) {
         try {
-            DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+            DocumentBuilderFactory docFactory = ParserUtils.getSaferDocumentBuilderFactory();
             DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
             DOMImplementation domImpl = docBuilder.getDOMImplementation();
             Document doc = createDocument(domImpl);
@@ -334,7 +335,7 @@ public class VsmCommand {
 
     public static String getPolicyMap(String name) {
         try {
-            DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+            DocumentBuilderFactory docFactory = ParserUtils.getSaferDocumentBuilderFactory();
             DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
             DOMImplementation domImpl = docBuilder.getDOMImplementation();
             Document doc = createDocument(domImpl);
@@ -367,7 +368,7 @@ public class VsmCommand {
 
     public static String getHello() {
         try {
-            DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+            DocumentBuilderFactory docFactory = ParserUtils.getSaferDocumentBuilderFactory();
             DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
             DOMImplementation domImpl = docBuilder.getDOMImplementation();
 
@@ -395,7 +396,7 @@ public class VsmCommand {
     public static String getVServiceNode(String vlanId, String ipAddr) {
         try {
             // Create the document and root element.
-            DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+            DocumentBuilderFactory docFactory = ParserUtils.getSaferDocumentBuilderFactory();
             DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
             DOMImplementation domImpl = docBuilder.getDOMImplementation();
             Document doc = createDocument(domImpl);