diff --git a/server/bundles/io.cloudbeaver.server/schema/service.sql.graphqls b/server/bundles/io.cloudbeaver.server/schema/service.sql.graphqls
index b51bb1cd2f..d5ab8ee8e8 100644
--- a/server/bundles/io.cloudbeaver.server/schema/service.sql.graphqls
+++ b/server/bundles/io.cloudbeaver.server/schema/service.sql.graphqls
@@ -44,6 +44,7 @@ type SQLContextInfo {
     id: ID!
     projectId: ID!
     connectionId: ID!
+    autoCommit: Boolean
     defaultCatalog: String
     defaultSchema: String
 
@@ -401,4 +402,26 @@ extend type Mutation {
 
     asyncSqlRowDataCountResult(taskId: ID!): Int!
 
+    @since(version: "24.0.1")
+    asyncSqlSetAutoCommit(
+        projectId: ID!,
+        connectionId: ID!,
+        contextId: ID!,
+        autoCommit: Boolean!
+    ): AsyncTaskInfo!
+
+    @since(version: "24.0.1")
+    asyncSqlCommitTransaction(
+        projectId: ID!,
+        connectionId: ID!,
+        contextId: ID!
+    ): AsyncTaskInfo!
+
+    @since(version: "24.0.1")
+    asyncSqlRollbackTransaction(
+        projectId: ID!,
+        connectionId: ID!,
+        contextId: ID!
+    ): AsyncTaskInfo!
+
 }
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/DBWServiceSQL.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/DBWServiceSQL.java
index 3dcb4b5f64..752357ba66 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/DBWServiceSQL.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/DBWServiceSQL.java
@@ -172,4 +172,22 @@ String generateGroupByQuery(@NotNull WebSQLContextInfo contextInfo,
     @Nullable
     @WebAction
     Long getRowDataCountResult(@NotNull WebSession webSession, @NotNull String taskId) throws DBWebException;
+
+    @WebAction
+    WebAsyncTaskInfo asyncSqlSetAutoCommit(
+        @NotNull WebSession webSession,
+        @NotNull WebSQLContextInfo contextInfo,
+        boolean autoCommit
+    ) throws DBWebException;
+
+    @WebAction
+    WebAsyncTaskInfo asyncSqlRollbackTransaction(
+        @NotNull WebSession webSession,
+        @NotNull WebSQLContextInfo contextInfo
+    ) throws DBWebException;
+
+    @WebAction
+    WebAsyncTaskInfo asyncSqlCommitTransaction(
+        @NotNull WebSession webSession,
+        @NotNull WebSQLContextInfo sqlContext);
 }
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLContextInfo.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLContextInfo.java
index 2a554eccd3..4856ed809b 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLContextInfo.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLContextInfo.java
@@ -19,20 +19,27 @@
 import io.cloudbeaver.DBWebException;
 import io.cloudbeaver.WebAction;
 import io.cloudbeaver.WebProjectImpl;
+import io.cloudbeaver.model.WebAsyncTaskInfo;
+import io.cloudbeaver.model.session.WebAsyncTaskProcessor;
 import io.cloudbeaver.model.session.WebSession;
 import io.cloudbeaver.model.session.WebSessionProvider;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
+import org.jkiss.dbeaver.model.DBUtils;
 import org.jkiss.dbeaver.model.data.DBDAttributeBinding;
-import org.jkiss.dbeaver.model.exec.DBCException;
-import org.jkiss.dbeaver.model.exec.DBCExecutionContextDefaults;
-import org.jkiss.dbeaver.model.exec.DBExecUtils;
+import org.jkiss.dbeaver.model.exec.*;
+import org.jkiss.dbeaver.model.meta.Property;
+import org.jkiss.dbeaver.model.qm.QMTransactionState;
+import org.jkiss.dbeaver.model.qm.QMUtils;
+import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.struct.DBSDataContainer;
 import org.jkiss.dbeaver.model.struct.rdb.DBSCatalog;
 import org.jkiss.dbeaver.model.struct.rdb.DBSSchema;
+import org.jkiss.dbeaver.utils.RuntimeUtils;
 import org.jkiss.utils.CommonUtils;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -170,4 +177,103 @@ void dispose() {
     public WebSession getWebSession() {
         return processor.getWebSession();
     }
+
+
+    ///////////////////////////////////////////////////////
+    // Transactions
+
+    public WebAsyncTaskInfo setAutoCommit(boolean autoCommit) {
+        DBCExecutionContext context = processor.getExecutionContext();
+        DBCTransactionManager txnManager = DBUtils.getTransactionManager(context);
+        WebAsyncTaskProcessor<Boolean> runnable = new WebAsyncTaskProcessor<>() {
+            @Override
+            public void run(DBRProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
+                if (txnManager != null) {
+                    monitor.beginTask("Change connection auto-commit to " + autoCommit, 1);
+                    try {
+                        monitor.subTask("Change context '" + context.getContextName() + "' auto-commit state");
+                        txnManager.setAutoCommit(monitor, autoCommit);
+                        result = true;
+                    } catch (DBException e) {
+                        throw new InvocationTargetException(e);
+                    } finally {
+                        monitor.done();
+                    }
+                }
+
+            }
+        };
+        return getWebSession().createAndRunAsyncTask("Set auto-commit", runnable);
+
+    }
+
+    public WebAsyncTaskInfo commitTransaction() {
+        DBCExecutionContext context = processor.getExecutionContext();
+        DBCTransactionManager txnManager = DBUtils.getTransactionManager(context);
+        WebAsyncTaskProcessor<String> runnable = new WebAsyncTaskProcessor<>() {
+            @Override
+            public void run(DBRProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
+                if (txnManager != null) {
+                    QMTransactionState txnInfo = QMUtils.getTransactionState(context);
+                    try (DBCSession session = context.openSession(monitor, DBCExecutionPurpose.UTIL, "Commit transaction")) {
+                        txnManager.commit(session);
+                    } catch (DBCException e) {
+                        throw new InvocationTargetException(e);
+                    }
+                    result = """
+                    Transaction has been committed
+                    Query count: %s
+                    Duration: %s
+                    """.formatted(
+                        txnInfo.getUpdateCount(),
+                        RuntimeUtils.formatExecutionTime(System.currentTimeMillis() - txnInfo.getTransactionStartTime())
+                    );
+                }
+            }
+        };
+        return getWebSession().createAndRunAsyncTask("Commit transaction", runnable);
+    }
+
+
+    public WebAsyncTaskInfo rollbackTransaction() {
+        DBCExecutionContext context = processor.getExecutionContext();
+        DBCTransactionManager txnManager = DBUtils.getTransactionManager(context);
+        WebAsyncTaskProcessor<String> runnable = new WebAsyncTaskProcessor<>() {
+            @Override
+            public void run(DBRProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
+                if (txnManager != null) {
+                    QMTransactionState txnInfo = QMUtils.getTransactionState(context);
+                    try (DBCSession session = context.openSession(monitor, DBCExecutionPurpose.UTIL, "Rollback transaction")) {
+                        txnManager.rollback(session, null);
+                    } catch (DBCException e) {
+                        throw new InvocationTargetException(e);
+                    }
+                    result = """
+                    Transaction has been rolled back
+                    Query count: %s
+                    Duration: %s
+                    """.formatted(
+                        txnInfo.getUpdateCount(),
+                        RuntimeUtils.formatExecutionTime(System.currentTimeMillis() - txnInfo.getTransactionStartTime())
+                    );
+                }
+            }
+        };
+
+        return getWebSession().createAndRunAsyncTask("Rollback transaction", runnable);
+    }
+
+    @Property
+    public Boolean isAutoCommit() throws DBWebException {
+        DBCExecutionContext context = processor.getExecutionContext();
+        DBCTransactionManager txnManager = DBUtils.getTransactionManager(context);
+        if (txnManager == null) {
+            return null;
+        }
+        try {
+            return txnManager.isAutoCommit();
+        } catch (DBException e) {
+            throw new DBWebException("Error getting auto-commit parameter from context", e);
+        }
+    }
 }
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java
index 7d4f225192..08e199f930 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java
@@ -358,9 +358,15 @@ public WebSQLExecuteInfo updateResultsDataBatch(
             try (DBCSession session = executionContext.openSession(monitor, DBCExecutionPurpose.USER, "Update data in container")) {
                 DBCTransactionManager txnManager = DBUtils.getTransactionManager(executionContext);
                 boolean revertToAutoCommit = false;
-                if (txnManager != null && txnManager.isSupportsTransactions() && txnManager.isAutoCommit()) {
-                    txnManager.setAutoCommit(monitor, false);
-                    revertToAutoCommit = true;
+                boolean isAutoCommitEnabled = true;
+                DBCSavepoint savepoint = null;
+                if (txnManager != null) {
+                    isAutoCommitEnabled = txnManager.isAutoCommit();
+                    if (txnManager.isSupportsTransactions() && isAutoCommitEnabled) {
+                        txnManager.setAutoCommit(monitor, false);
+                        savepoint = txnManager.setSavepoint(monitor, null);
+                        revertToAutoCommit = true;
+                    }
                 }
                 try {
                     Map<String, Object> options = Collections.emptyMap();
@@ -375,17 +381,27 @@ public WebSQLExecuteInfo updateResultsDataBatch(
                         newResultSetRows.add(new WebSQLQueryResultSetRow(rowValues, null));
                     }
 
-                    if (txnManager != null && txnManager.isSupportsTransactions()) {
+                    if (txnManager != null && txnManager.isSupportsTransactions() && isAutoCommitEnabled) {
                         txnManager.commit(session);
                     }
                 } catch (Exception e) {
                     if (txnManager != null && txnManager.isSupportsTransactions()) {
-                        txnManager.rollback(session, null);
+                        txnManager.rollback(session, savepoint);
                     }
                     throw new DBCException("Error persisting data changes", e);
                 } finally {
-                    if (revertToAutoCommit) {
-                        txnManager.setAutoCommit(monitor, true);
+                    if (txnManager != null) {
+                        if (revertToAutoCommit) {
+                            txnManager.setAutoCommit(monitor, true);
+                        }
+                        try {
+                            if (savepoint != null) {
+                                txnManager.releaseSavepoint(monitor, savepoint);
+                            }
+                        } catch (Throwable e) {
+                            // Maybe savepoints not supported
+                            log.debug("Can't release savepoint", e);
+                        }
                     }
                 }
             }
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebServiceBindingSQL.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebServiceBindingSQL.java
index cc266b8265..662fe6bd7e 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebServiceBindingSQL.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebServiceBindingSQL.java
@@ -207,8 +207,23 @@ public void bindWiring(DBWBindingContext model) throws DBWebException {
                 getService(env).getRowDataCountResult(
                     getWebSession(env),
                     env.getArgument("taskId")
-            )
-        );
+            ))
+            .dataFetcher("asyncSqlSetAutoCommit", env ->
+                getService(env).asyncSqlSetAutoCommit(
+                    getWebSession(env),
+                    getSQLContext(env),
+                    env.getArgument("autoCommit")
+            ))
+            .dataFetcher("asyncSqlCommitTransaction", env ->
+                getService(env).asyncSqlCommitTransaction(
+                    getWebSession(env),
+                    getSQLContext(env)
+                ))
+            .dataFetcher("asyncSqlRollbackTransaction", env ->
+                getService(env).asyncSqlRollbackTransaction(
+                    getWebSession(env),
+                    getSQLContext(env)
+                ));
     }
 
     @NotNull
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/impl/WebServiceSQL.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/impl/WebServiceSQL.java
index 8728b647c6..e07d0e24cd 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/impl/WebServiceSQL.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/impl/WebServiceSQL.java
@@ -48,7 +48,6 @@
 import org.jkiss.dbeaver.model.sql.registry.SQLGeneratorConfigurationRegistry;
 import org.jkiss.dbeaver.model.sql.registry.SQLGeneratorDescriptor;
 import org.jkiss.dbeaver.model.struct.DBSDataContainer;
-import org.jkiss.dbeaver.model.struct.DBSEntity;
 import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.model.struct.DBSWrapper;
 import org.jkiss.dbeaver.utils.RuntimeUtils;
@@ -579,4 +578,19 @@ public Long getRowDataCountResult(@NotNull WebSession webSession, @NotNull Strin
         return null;
     }
 
+    @Override
+    public WebAsyncTaskInfo asyncSqlSetAutoCommit(@NotNull WebSession webSession, @NotNull WebSQLContextInfo contextInfo, boolean autoCommit) throws DBWebException {
+        return contextInfo.setAutoCommit(autoCommit);
+    }
+
+    @Override
+    public WebAsyncTaskInfo asyncSqlRollbackTransaction(@NotNull WebSession webSession, @NotNull WebSQLContextInfo contextInfo) throws DBWebException {
+        return contextInfo.rollbackTransaction();
+    }
+
+    @Override
+    public WebAsyncTaskInfo asyncSqlCommitTransaction(@NotNull WebSession webSession, @NotNull WebSQLContextInfo contextInfo) {
+        return contextInfo.commitTransaction();
+    }
+
 }
diff --git a/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContext.ts b/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContext.ts
index 31b804d9c0..b06e38d3d8 100644
--- a/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContext.ts
+++ b/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContext.ts
@@ -8,10 +8,16 @@
 import { computed, makeObservable, observable } from 'mobx';
 
 import type { ITask, TaskScheduler } from '@cloudbeaver/core-executor';
+import type { AsyncTaskInfo, AsyncTaskInfoService, GraphQLService } from '@cloudbeaver/core-sdk';
 
 import type { ConnectionExecutionContextResource, IConnectionExecutionContextInfo } from './ConnectionExecutionContextResource';
 import type { IConnectionExecutionContext } from './IConnectionExecutionContext';
 
+export interface IConnectionExecutionContextUpdateTaskInfo {
+  name?: string;
+  result?: string | boolean;
+}
+
 export class ConnectionExecutionContext implements IConnectionExecutionContext {
   get context(): IConnectionExecutionContextInfo | undefined {
     return this.connectionExecutionContextResource.get(this.contextId);
@@ -25,12 +31,22 @@ export class ConnectionExecutionContext implements IConnectionExecutionContext {
     return this.currentTask?.cancellable || false;
   }
 
+  get autoCommit() {
+    if (!this.context) {
+      return;
+    }
+
+    return this.context.autoCommit;
+  }
+
   private currentTask: ITask<any> | null;
 
   constructor(
+    private readonly contextId: string,
     private readonly scheduler: TaskScheduler<string>,
     private readonly connectionExecutionContextResource: ConnectionExecutionContextResource,
-    private readonly contextId: string,
+    private readonly asyncTaskInfoService: AsyncTaskInfoService,
+    private readonly graphQLService: GraphQLService,
   ) {
     this.currentTask = null;
     makeObservable<this, 'currentTask'>(this, {
@@ -38,6 +54,7 @@ export class ConnectionExecutionContext implements IConnectionExecutionContext {
       context: computed,
       executing: computed,
       cancellable: computed,
+      autoCommit: computed,
     });
   }
 
@@ -76,4 +93,86 @@ export class ConnectionExecutionContext implements IConnectionExecutionContext {
 
     return await this.connectionExecutionContextResource.update(this.contextId, defaultCatalog, defaultSchema);
   }
+
+  async setAutoCommit(auto: boolean): Promise<IConnectionExecutionContextUpdateTaskInfo> {
+    const result = await this.withContext(async context => {
+      const task = this.asyncTaskInfoService.create(async () => {
+        const { taskInfo } = await this.graphQLService.sdk.asyncSqlSetAutoCommit({
+          projectId: context.projectId,
+          connectionId: context.connectionId,
+          contextId: context.id,
+          autoCommit: auto,
+        });
+
+        return taskInfo;
+      });
+
+      return await this.run(
+        async () => await this.asyncTaskInfoService.run(task),
+        () => this.asyncTaskInfoService.cancel(task.id),
+        () => this.asyncTaskInfoService.remove(task.id),
+      );
+    });
+
+    return mapAsyncTaskInfo(result);
+  }
+
+  async commit(): Promise<IConnectionExecutionContextUpdateTaskInfo> {
+    const result = await this.withContext(async context => {
+      const task = this.asyncTaskInfoService.create(async () => {
+        const { taskInfo } = await this.graphQLService.sdk.asyncSqlCommitTransaction({
+          projectId: context.projectId,
+          connectionId: context.connectionId,
+          contextId: context.id,
+        });
+
+        return taskInfo;
+      });
+
+      return await this.run(
+        async () => await this.asyncTaskInfoService.run(task),
+        () => this.asyncTaskInfoService.cancel(task.id),
+        () => this.asyncTaskInfoService.remove(task.id),
+      );
+    });
+
+    return mapAsyncTaskInfo(result);
+  }
+
+  async rollback(): Promise<IConnectionExecutionContextUpdateTaskInfo> {
+    const result = await this.withContext(async context => {
+      const task = this.asyncTaskInfoService.create(async () => {
+        const { taskInfo } = await this.graphQLService.sdk.asyncSqlRollbackTransaction({
+          projectId: context.projectId,
+          connectionId: context.connectionId,
+          contextId: context.id,
+        });
+
+        return taskInfo;
+      });
+
+      return await this.run(
+        async () => await this.asyncTaskInfoService.run(task),
+        () => this.asyncTaskInfoService.cancel(task.id),
+        () => this.asyncTaskInfoService.remove(task.id),
+      );
+    });
+
+    return mapAsyncTaskInfo(result);
+  }
+
+  private withContext<R>(callback: (context: IConnectionExecutionContextInfo) => Promise<R>): Promise<R> {
+    if (!this.context) {
+      throw new Error('Execution Context not found');
+    }
+
+    return callback(this.context);
+  }
+}
+
+function mapAsyncTaskInfo(info: AsyncTaskInfo): IConnectionExecutionContextUpdateTaskInfo {
+  return {
+    name: info.name,
+    result: info.taskResult,
+  };
 }
diff --git a/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContextService.ts b/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContextService.ts
index 8747a60e2b..6da75ec1ea 100644
--- a/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContextService.ts
+++ b/webapp/packages/core-connections/src/ConnectionExecutionContext/ConnectionExecutionContextService.ts
@@ -8,6 +8,7 @@
 import { injectable } from '@cloudbeaver/core-di';
 import { TaskScheduler } from '@cloudbeaver/core-executor';
 import { CachedMapAllKey, ResourceKeyUtils } from '@cloudbeaver/core-resource';
+import { AsyncTaskInfoService, GraphQLService } from '@cloudbeaver/core-sdk';
 import { MetadataMap } from '@cloudbeaver/core-utils';
 
 import type { IConnectionInfoParams } from '../CONNECTION_INFO_PARAM_SCHEMA';
@@ -19,8 +20,21 @@ export class ConnectionExecutionContextService {
   private readonly contexts: MetadataMap<string, ConnectionExecutionContext>;
   protected scheduler: TaskScheduler<string>;
 
-  constructor(readonly connectionExecutionContextResource: ConnectionExecutionContextResource) {
-    this.contexts = new MetadataMap(contextId => new ConnectionExecutionContext(this.scheduler, this.connectionExecutionContextResource, contextId));
+  constructor(
+    readonly connectionExecutionContextResource: ConnectionExecutionContextResource,
+    private readonly asyncTaskInfoService: AsyncTaskInfoService,
+    private readonly GraphQLService: GraphQLService,
+  ) {
+    this.contexts = new MetadataMap(
+      contextId =>
+        new ConnectionExecutionContext(
+          contextId,
+          this.scheduler,
+          this.connectionExecutionContextResource,
+          this.asyncTaskInfoService,
+          this.GraphQLService,
+        ),
+    );
     this.scheduler = new TaskScheduler((a, b) => a === b);
     this.connectionExecutionContextResource.onItemDelete.addHandler(key =>
       ResourceKeyUtils.forEach(key, contextId => this.contexts.delete(contextId)),
diff --git a/webapp/packages/core-connections/src/ConnectionsManagerService.ts b/webapp/packages/core-connections/src/ConnectionsManagerService.ts
index 82f695bd68..5146828808 100644
--- a/webapp/packages/core-connections/src/ConnectionsManagerService.ts
+++ b/webapp/packages/core-connections/src/ConnectionsManagerService.ts
@@ -152,6 +152,7 @@ export class ConnectionsManagerService {
     if (!connection.connected) {
       return;
     }
+
     await this.connectionInfo.close(createConnectionParam(connection));
   }
 
@@ -159,13 +160,29 @@ export class ConnectionsManagerService {
     if (this.disconnecting) {
       return;
     }
+
+    const connectionParams = this.projectConnections.map(connection => createConnectionParam(connection));
+    const contexts = await this.onDisconnect.execute({
+      connections: connectionParams,
+      state: 'before',
+    });
+
+    if (ExecutorInterrupter.isInterrupted(contexts)) {
+      return;
+    }
+
     this.disconnecting = true;
     const { controller, notification } = this.notificationService.processNotification(() => ProcessSnackbar, {}, { title: 'Disconnecting...' });
 
     try {
       for (const connection of this.projectConnections) {
         await this._closeConnectionAsync(connection);
+        this.onDisconnect.execute({
+          connections: [createConnectionParam(connection)],
+          state: 'after',
+        });
       }
+
       notification.close();
     } catch (e: any) {
       controller.reject(e);
diff --git a/webapp/packages/core-connections/src/extensions/IExecutionContextProvider.ts b/webapp/packages/core-connections/src/extensions/IExecutionContextProvider.ts
new file mode 100644
index 0000000000..599597d0f9
--- /dev/null
+++ b/webapp/packages/core-connections/src/extensions/IExecutionContextProvider.ts
@@ -0,0 +1,22 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { createExtension, IExtension, isExtension } from '@cloudbeaver/core-extensions';
+
+import type { IConnectionExecutionContextInfo } from '../ConnectionExecutionContext/ConnectionExecutionContextResource';
+
+const EXECUTION_CONTEXT_PROVIDER_SYMBOL = Symbol('@extension/ExecutionContextProvider');
+
+export type IExecutionContextProvider<T = never> = (context: T) => IConnectionExecutionContextInfo | undefined;
+
+export function executionContextProvider<T>(provider: IExecutionContextProvider<T>) {
+  return createExtension<T>(provider, EXECUTION_CONTEXT_PROVIDER_SYMBOL);
+}
+
+export function isExecutionContextProvider<T>(obj: IExtension<T>): obj is IExecutionContextProvider<T> & IExtension<T> {
+  return isExtension(obj, EXECUTION_CONTEXT_PROVIDER_SYMBOL);
+}
diff --git a/webapp/packages/core-connections/src/index.ts b/webapp/packages/core-connections/src/index.ts
index ede58b7a42..202ebbf4a9 100644
--- a/webapp/packages/core-connections/src/index.ts
+++ b/webapp/packages/core-connections/src/index.ts
@@ -9,6 +9,7 @@ export * from './extensions/IObjectCatalogProvider';
 export * from './extensions/IObjectCatalogSetter';
 export * from './extensions/IObjectSchemaProvider';
 export * from './extensions/IObjectSchemaSetter';
+export * from './extensions/IExecutionContextProvider';
 export * from './NavTree/ConnectionNavNodeService';
 export * from './NavTree/NavNodeExtensionsService';
 export * from './NavTree/getConnectionFolderIdFromNodeId';
diff --git a/webapp/packages/core-sdk/src/queries/fragments/ExecutionContextInfo.gql b/webapp/packages/core-sdk/src/queries/fragments/ExecutionContextInfo.gql
index eb1925b4d8..9f23894015 100644
--- a/webapp/packages/core-sdk/src/queries/fragments/ExecutionContextInfo.gql
+++ b/webapp/packages/core-sdk/src/queries/fragments/ExecutionContextInfo.gql
@@ -1,7 +1,8 @@
 fragment ExecutionContextInfo on SQLContextInfo {
-    id
-    projectId
-    connectionId
-    defaultCatalog
-    defaultSchema
-}
\ No newline at end of file
+  id
+  projectId
+  connectionId
+  autoCommit
+  defaultCatalog
+  defaultSchema
+}
diff --git a/webapp/packages/core-sdk/src/queries/transactions/asyncSqlCommitTransaction.gql b/webapp/packages/core-sdk/src/queries/transactions/asyncSqlCommitTransaction.gql
new file mode 100644
index 0000000000..8253d797a6
--- /dev/null
+++ b/webapp/packages/core-sdk/src/queries/transactions/asyncSqlCommitTransaction.gql
@@ -0,0 +1,5 @@
+mutation asyncSqlCommitTransaction($projectId: ID!, $connectionId: ID!, $contextId: ID!) {
+  taskInfo: asyncSqlCommitTransaction(projectId: $projectId, connectionId: $connectionId, contextId: $contextId) {
+    ...AsyncTaskInfo
+  }
+}
diff --git a/webapp/packages/core-sdk/src/queries/transactions/asyncSqlRollbackTransaction.gql b/webapp/packages/core-sdk/src/queries/transactions/asyncSqlRollbackTransaction.gql
new file mode 100644
index 0000000000..2b13f458cf
--- /dev/null
+++ b/webapp/packages/core-sdk/src/queries/transactions/asyncSqlRollbackTransaction.gql
@@ -0,0 +1,5 @@
+mutation asyncSqlRollbackTransaction($projectId: ID!, $connectionId: ID!, $contextId: ID!) {
+  taskInfo: asyncSqlRollbackTransaction(projectId: $projectId, connectionId: $connectionId, contextId: $contextId) {
+    ...AsyncTaskInfo
+  }
+}
diff --git a/webapp/packages/core-sdk/src/queries/transactions/asyncSqlSetAutoCommit.gql b/webapp/packages/core-sdk/src/queries/transactions/asyncSqlSetAutoCommit.gql
new file mode 100644
index 0000000000..9b2a6de697
--- /dev/null
+++ b/webapp/packages/core-sdk/src/queries/transactions/asyncSqlSetAutoCommit.gql
@@ -0,0 +1,5 @@
+mutation asyncSqlSetAutoCommit($projectId: ID!, $connectionId: ID!, $contextId: ID!, $autoCommit: Boolean!) {
+  taskInfo: asyncSqlSetAutoCommit(projectId: $projectId, connectionId: $connectionId, contextId: $contextId, autoCommit: $autoCommit) {
+    ...AsyncTaskInfo
+  }
+}
diff --git a/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSchemaManagerService.ts b/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSchemaManagerService.ts
index 2f0d71d4c1..e61ff1e75f 100644
--- a/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSchemaManagerService.ts
+++ b/webapp/packages/plugin-datasource-context-switch/src/ConnectionSchemaManager/ConnectionSchemaManagerService.ts
@@ -15,12 +15,14 @@ import {
   IConnectionInfoParams,
   IConnectionProvider,
   IConnectionSetter,
+  IExecutionContextProvider,
   IObjectCatalogProvider,
   IObjectCatalogSetter,
   IObjectSchemaProvider,
   IObjectSchemaSetter,
   isConnectionProvider,
   isConnectionSetter,
+  isExecutionContextProvider,
   isObjectCatalogProvider,
   isObjectCatalogSetter,
   isObjectSchemaProvider,
@@ -58,6 +60,7 @@ interface IActiveItem<T> {
   getCurrentConnectionId?: IConnectionProvider<T>;
   getCurrentSchemaId?: IObjectSchemaProvider<T>;
   getCurrentCatalogId?: IObjectCatalogProvider<T>;
+  getCurrentExecutionContext?: IExecutionContextProvider<T>;
   changeConnectionId?: IConnectionSetter<T>;
   changeProjectId?: IProjectSetter<T>;
   changeCatalogId?: IObjectCatalogSetter<T>;
@@ -121,6 +124,14 @@ export class ConnectionSchemaManagerService {
     return this.activeObjectCatalogId;
   }
 
+  get activeExecutionContext() {
+    if (!this.activeItem?.getCurrentExecutionContext) {
+      return;
+    }
+
+    return this.activeItem.getCurrentExecutionContext(this.activeItem.context);
+  }
+
   get currentObjectSchemaId(): string | undefined {
     if (this.pendingSchemaId !== null) {
       return this.pendingSchemaId;
@@ -442,6 +453,9 @@ export class ConnectionSchemaManagerService {
       .on(isObjectSchemaProvider, extension => {
         item.getCurrentSchemaId = extension;
       })
+      .on(isExecutionContextProvider, extension => {
+        item.getCurrentExecutionContext = extension;
+      })
 
       .on(isProjectSetter, extension => {
         item.changeProjectId = extension;
diff --git a/webapp/packages/plugin-datasource-transaction-manager/.gitignore b/webapp/packages/plugin-datasource-transaction-manager/.gitignore
new file mode 100644
index 0000000000..15bc16c7c3
--- /dev/null
+++ b/webapp/packages/plugin-datasource-transaction-manager/.gitignore
@@ -0,0 +1,17 @@
+# dependencies
+/node_modules
+
+# testing
+/coverage
+
+# production
+/lib
+
+# misc
+.DS_Store
+.env*
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
diff --git a/webapp/packages/plugin-datasource-transaction-manager/package.json b/webapp/packages/plugin-datasource-transaction-manager/package.json
new file mode 100644
index 0000000000..cc10783b7a
--- /dev/null
+++ b/webapp/packages/plugin-datasource-transaction-manager/package.json
@@ -0,0 +1,37 @@
+{
+  "name": "@cloudbeaver/plugin-datasource-transaction-manager",
+  "sideEffects": [
+    "src/**/*.css",
+    "src/**/*.scss",
+    "public/**/*"
+  ],
+  "version": "0.1.0",
+  "description": "",
+  "license": "Apache-2.0",
+  "main": "dist/index.js",
+  "scripts": {
+    "build": "tsc -b",
+    "lint": "eslint ./src/ --ext .ts,.tsx",
+    "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix",
+    "validate-dependencies": "core-cli-validate-dependencies",
+    "update-ts-references": "rimraf --glob dist && typescript-resolve-references"
+  },
+  "dependencies": {
+    "@cloudbeaver/core-connections": "~0.1.0",
+    "@cloudbeaver/core-di": "~0.1.0",
+    "@cloudbeaver/core-events": "~0.1.0",
+    "@cloudbeaver/core-executor": "~0.1.0",
+    "@cloudbeaver/core-localization": "~0.1.0",
+    "@cloudbeaver/core-sdk": "~0.1.0",
+    "@cloudbeaver/core-ui": "~0.1.0",
+    "@cloudbeaver/core-utils": "~0.1.0",
+    "@cloudbeaver/core-view": "~0.1.0",
+    "@cloudbeaver/plugin-datasource-context-switch": "~0.1.0",
+    "@cloudbeaver/plugin-top-app-bar": "~0.1.0",
+    "mobx": "^6.12.0"
+  },
+  "peerDependencies": {},
+  "devDependencies": {
+    "typescript": "^5.3.2"
+  }
+}
diff --git a/webapp/packages/plugin-datasource-transaction-manager/public/icons/commit.svg b/webapp/packages/plugin-datasource-transaction-manager/public/icons/commit.svg
new file mode 100644
index 0000000000..e640e089ef
--- /dev/null
+++ b/webapp/packages/plugin-datasource-transaction-manager/public/icons/commit.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #fff;
+        stroke-width: 0px;
+      }
+    </style>
+  </defs>
+  <g>
+    <path class="cls-1" d="M16.01,30H5.93c-.54,0-1.05-.25-1.41-.67-.33-.38-.51-.89-.51-1.42V4.09c0-.53.18-1.03.51-1.42.36-.42.87-.67,1.41-.67h14.53l7.55,8.62v6.38h-2v-5.62l-6.45-7.38H6.02s-.01.05-.01.09v23.83s0,.07.01.09h9.99v2Z"/>
+    <path class="cls-1" d="M27.01,12h-6.01c-1.1,0-1.99-.89-1.99-1.99V3h2v7.01h6s0,1.99,0,1.99Z"/>
+  </g>
+  <path class="cls-1" d="M27.01,30h-6c-1.65,0-3-1.35-3-3v-6c0-1.65,1.35-3,3-3h5.08l3.92,3.92v5.08c0,1.65-1.35,3-3,3ZM21.01,20c-.55,0-1,.45-1,1v6c0,.55.45,1,1,1h6c.55,0,1-.45,1-1v-4.25l-2.75-2.75h-4.25Z"/>
+  <path class="cls-1" d="M26.01,22h-5v-4h5v4ZM23.01,20h1-1Z"/>
+</svg>
\ No newline at end of file
diff --git a/webapp/packages/plugin-datasource-transaction-manager/public/icons/commit_m.svg b/webapp/packages/plugin-datasource-transaction-manager/public/icons/commit_m.svg
new file mode 100644
index 0000000000..f07ddff927
--- /dev/null
+++ b/webapp/packages/plugin-datasource-transaction-manager/public/icons/commit_m.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #fff;
+        stroke-width: 0px;
+      }
+    </style>
+  </defs>
+  <g>
+    <path class="cls-1" d="M11.33,21.75h-6.72c-.38,0-.75-.17-1-.48-.23-.28-.36-.63-.36-1V4.39c0-.37.13-.72.35-1,.26-.31.63-.48,1.01-.48h9.73l5.08,5.8v4.28h-1.5v-3.72l-4.26-4.87H4.75v15.83s6.58,0,6.58,0v1.5Z"/>
+    <path class="cls-1" d="M18.67,9.75h-4.01c-.78,0-1.41-.63-1.41-1.41V3.67h1.5v4.58h3.92v1.5Z"/>
+  </g>
+  <path class="cls-1" d="M18.67,21.75h-4c-1.15,0-2.08-.93-2.08-2.08v-4c0-1.15.93-2.08,2.08-2.08h3.42l2.66,2.66v3.42c0,1.15-.93,2.08-2.08,2.08ZM14.67,15.08c-.32,0-.58.26-.58.58v4c0,.32.26.58.58.58h4c.32,0,.58-.26.58-.58v-2.8l-1.78-1.78h-2.8Z"/>
+  <rect class="cls-1" x="15.25" y="13.58" width="2.5" height="2.83"/>
+</svg>
\ No newline at end of file
diff --git a/webapp/packages/plugin-datasource-transaction-manager/public/icons/commit_mode_auto.svg b/webapp/packages/plugin-datasource-transaction-manager/public/icons/commit_mode_auto.svg
new file mode 100644
index 0000000000..cfa19cd5a2
--- /dev/null
+++ b/webapp/packages/plugin-datasource-transaction-manager/public/icons/commit_mode_auto.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #fff;
+        stroke-width: 0px;
+      }
+    </style>
+  </defs>
+  <polygon class="cls-1" points="25.01 3 4.01 3 4.01 5 13.01 5 13.01 28 15.01 28 15.01 5 25.01 5 25.01 3"/>
+  <g>
+    <rect class="cls-1" x="26.01" y="8" width="2" height="2"/>
+    <rect class="cls-1" x="22.01" y="8" width="2" height="2"/>
+    <rect class="cls-1" x="18.01" y="8" width="2" height="2"/>
+    <rect class="cls-1" x="18.01" y="12" width="2" height="2"/>
+    <rect class="cls-1" x="18.01" y="16" width="2" height="2"/>
+    <rect class="cls-1" x="18.01" y="20" width="2" height="2"/>
+    <rect class="cls-1" x="18.01" y="24" width="2" height="2"/>
+    <rect class="cls-1" x="18.01" y="28" width="2" height="2"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/webapp/packages/plugin-datasource-transaction-manager/public/icons/commit_mode_auto_m.svg b/webapp/packages/plugin-datasource-transaction-manager/public/icons/commit_mode_auto_m.svg
new file mode 100644
index 0000000000..812bca94d1
--- /dev/null
+++ b/webapp/packages/plugin-datasource-transaction-manager/public/icons/commit_mode_auto_m.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #fff;
+        stroke-width: 0px;
+      }
+    </style>
+  </defs>
+  <polygon class="cls-1" points="18 3 4 3 4 4.33 10 4.33 10 19.67 11.33 19.67 11.33 4.33 18 4.33 18 3"/>
+  <g>
+    <rect class="cls-1" x="18.67" y="6.33" width="1.33" height="1.33"/>
+    <rect class="cls-1" x="16" y="6.33" width="1.33" height="1.33"/>
+    <rect class="cls-1" x="13.33" y="6.33" width="1.33" height="1.33"/>
+    <rect class="cls-1" x="13.33" y="9" width="1.33" height="1.33"/>
+    <rect class="cls-1" x="13.33" y="11.67" width="1.33" height="1.33"/>
+    <rect class="cls-1" x="13.33" y="14.33" width="1.33" height="1.33"/>
+    <rect class="cls-1" x="13.33" y="17" width="1.33" height="1.33"/>
+    <rect class="cls-1" x="13.33" y="19.67" width="1.33" height="1.33"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/webapp/packages/plugin-datasource-transaction-manager/public/icons/commit_mode_auto_sm.svg b/webapp/packages/plugin-datasource-transaction-manager/public/icons/commit_mode_auto_sm.svg
new file mode 100644
index 0000000000..fbc45eba62
--- /dev/null
+++ b/webapp/packages/plugin-datasource-transaction-manager/public/icons/commit_mode_auto_sm.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #fff;
+        stroke-width: 0px;
+      }
+    </style>
+  </defs>
+  <polygon class="cls-1" points="13 1 2 1 2 2 7 2 7 14 8 14 8 2 13 2 13 1"/>
+  <g>
+    <rect class="cls-1" x="14" y="4" width="1" height="1"/>
+    <rect class="cls-1" x="12" y="4" width="1" height="1"/>
+    <rect class="cls-1" x="10" y="4" width="1" height="1"/>
+    <rect class="cls-1" x="10" y="6" width="1" height="1"/>
+    <rect class="cls-1" x="10" y="8" width="1" height="1"/>
+    <rect class="cls-1" x="10" y="10" width="1" height="1"/>
+    <rect class="cls-1" x="10" y="12" width="1" height="1"/>
+    <rect class="cls-1" x="10" y="14" width="1" height="1"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/webapp/packages/plugin-datasource-transaction-manager/public/icons/commit_mode_manual.svg b/webapp/packages/plugin-datasource-transaction-manager/public/icons/commit_mode_manual.svg
new file mode 100644
index 0000000000..62920cce76
--- /dev/null
+++ b/webapp/packages/plugin-datasource-transaction-manager/public/icons/commit_mode_manual.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #fff;
+        stroke-width: 0px;
+      }
+    </style>
+  </defs>
+  <path class="cls-1" d="M19.21,29H6.01v-9.81l6.3-2.1c.6-.2,1.25-.05,1.69.4l1.14,1.14c.36.36.53.85.47,1.35-.05.5-.33.94-.75,1.21l-1.36.86,7.97.74h0c.56,0,1.14.38,1.41.98.25.56.16,1.2-.21,1.68l-1.4,2.37c-.43.73-1.22,1.18-2.07,1.18ZM8.01,27h11.2c.14,0,.28-.08.35-.2l1.23-2.07-7.87-.73c-.35.01-1.68,0-2.1-1-.26-.63-.04-1.31.66-2.01l.17-.14,1.77-1.12-.68-.68-4.73,1.58v6.37ZM21.32,24.78s.04,0,.06,0h-.06Z"/>
+  <polygon class="cls-1" points="25.01 2 13.01 2 13.01 4 18.01 4 18.01 17 20.01 17 20.01 4 25.01 4 25.01 2"/>
+  <rect class="cls-1" x="25.01" y="6" width="2" height="2"/>
+  <rect class="cls-1" x="22.01" y="6" width="2" height="2"/>
+  <rect class="cls-1" x="22.01" y="9" width="2" height="2"/>
+  <rect class="cls-1" x="22.01" y="12" width="2" height="2"/>
+  <rect class="cls-1" x="22.01" y="15" width="2" height="2"/>
+  <rect class="cls-1" x="22.01" y="18" width="2" height="2"/>
+  <rect class="cls-1" x="28.01" y="6" width="2" height="2"/>
+  <path class="cls-1" d="M6.03,30h-2.04c-1.09,0-1.98-.89-1.98-1.98v-8.14c0-1.09.89-1.98,1.98-1.98h2.04c1.09,0,1.98.89,1.98,1.98v8.14c0,1.09-.89,1.98-1.98,1.98ZM6.03,28v1-1h0,0ZM6.01,19.88l-2.02.02.02,8.12,2-.02v-8.12Z"/>
+</svg>
\ No newline at end of file
diff --git a/webapp/packages/plugin-datasource-transaction-manager/public/icons/commit_mode_manual_m.svg b/webapp/packages/plugin-datasource-transaction-manager/public/icons/commit_mode_manual_m.svg
new file mode 100644
index 0000000000..82ca26326a
--- /dev/null
+++ b/webapp/packages/plugin-datasource-transaction-manager/public/icons/commit_mode_manual_m.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #fff;
+        stroke-width: 0px;
+      }
+    </style>
+  </defs>
+  <path class="cls-1" d="M13.8,21.08H4.92v-6.69l4.26-1.42c.43-.14.89-.03,1.21.28l.76.76c.26.25.38.61.34.97-.04.36-.24.68-.54.87l-.7.44,5.07.47h0c.4,0,.82.28,1,.7.18.4.12.86-.15,1.2l-.93,1.58c-.3.51-.86.83-1.45.83ZM6.42,19.58h7.38c.07,0,.13-.03.16-.09l.75-1.27-5.11-.48c-.22.01-1.17,0-1.47-.72-.13-.31-.16-.82.46-1.43l.13-.1,1.09-.69-.34-.34-3.05,1.02v4.11ZM15.19,18.27s.04,0,.05,0h-.05Z"/>
+  <polygon class="cls-1" points="17.67 3 9.67 3 9.67 4.33 13 4.33 13 13 14.33 13 14.33 4.33 17.67 4.33 17.67 3"/>
+  <rect class="cls-1" x="17.67" y="5.67" width="1.33" height="1.33"/>
+  <rect class="cls-1" x="15.67" y="5.67" width="1.33" height="1.33"/>
+  <rect class="cls-1" x="15.67" y="7.67" width="1.33" height="1.33"/>
+  <rect class="cls-1" x="15.67" y="9.67" width="1.33" height="1.33"/>
+  <rect class="cls-1" x="15.67" y="11.67" width="1.33" height="1.33"/>
+  <rect class="cls-1" x="15.67" y="13.67" width="1.33" height="1.33"/>
+  <rect class="cls-1" x="19.67" y="5.67" width="1.33" height="1.33"/>
+  <path class="cls-1" d="M4.69,21.75h-.71c-.95,0-1.73-.78-1.73-1.73v-4.77c0-.95.78-1.73,1.73-1.73h.71c.95,0,1.73.78,1.73,1.73v4.77c0,.95-.78,1.73-1.73,1.73ZM3.98,15.02c-.13,0-.23.1-.23.23v4.77c0,.13.1.23.23.23h.71c.13,0,.23-.1.23-.23v-4.77c0-.13-.1-.23-.23-.23h-.71Z"/>
+</svg>
\ No newline at end of file
diff --git a/webapp/packages/plugin-datasource-transaction-manager/public/icons/commit_mode_manual_sm.svg b/webapp/packages/plugin-datasource-transaction-manager/public/icons/commit_mode_manual_sm.svg
new file mode 100644
index 0000000000..f23fd9fbe5
--- /dev/null
+++ b/webapp/packages/plugin-datasource-transaction-manager/public/icons/commit_mode_manual_sm.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #fff;
+        stroke-width: 0px;
+      }
+    </style>
+  </defs>
+  <path class="cls-1" d="M9.6,14.5H3v-4.91l3.15-1.05c.29-.1.62-.02.84.2l.57.57c.18.18.26.42.24.67-.03.25-.17.47-.38.61l-.68.43,3.98.37h0c.28,0,.57.19.7.49.12.28.08.6-.1.84l-.7,1.19c-.22.36-.61.59-1.04.59ZM4,13.5h5.6c.07,0,.14-.04.17-.1l.61-1.03-3.93-.37c-.18,0-.84,0-1.05-.5-.13-.32-.02-.65.33-1l.09-.07.88-.56-.34-.34-2.36.79v3.19ZM10.66,12.39s.02,0,.03,0h-.03ZM6.47,9.49h0,0Z"/>
+  <polygon class="cls-1" points="12 1 5 1 5 2 8 2 8 8 9 8 9 2 12 2 12 1"/>
+  <rect class="cls-1" x="12" y="3" width="1" height="1"/>
+  <rect class="cls-1" x="14" y="3" width="1" height="1"/>
+  <rect class="cls-1" x="10" y="3" width="1" height="1"/>
+  <rect class="cls-1" x="10" y="5" width="1" height="1"/>
+  <rect class="cls-1" x="10" y="7" width="1" height="1"/>
+  <rect class="cls-1" x="10" y="9" width="1" height="1"/>
+  <path class="cls-1" d="M2.99,15h-.97c-.56,0-1.01-.45-1.01-1.01v-4.02c0-.56.45-1.01,1.01-1.01h.97c.56,0,1.01.45,1.01,1.01v4.02c0,.56-.45,1.01-1.01,1.01ZM2.01,9.95v4.03s.97.01.97.01c0,0,.01,0,.01-.01v-4.02h-.99Z"/>
+</svg>
\ No newline at end of file
diff --git a/webapp/packages/plugin-datasource-transaction-manager/public/icons/commit_sm.svg b/webapp/packages/plugin-datasource-transaction-manager/public/icons/commit_sm.svg
new file mode 100644
index 0000000000..6ef412d43f
--- /dev/null
+++ b/webapp/packages/plugin-datasource-transaction-manager/public/icons/commit_sm.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #fff;
+        stroke-width: 0px;
+      }
+    </style>
+  </defs>
+  <g>
+    <path class="cls-1" d="M8,15H2.96c-.27,0-.53-.12-.71-.34-.16-.19-.25-.44-.25-.71V2.04c0-.26.09-.52.25-.71.18-.21.44-.34.71-.34h7.25l3.79,3.79v3.21h-1v-2.79l-3.21-3.21H2.96l.04,11.96,5,.04v1Z"/>
+    <path class="cls-1" d="M13.5,5.5h-3c-.55,0-1-.45-1-1V1.5h1v3h3s0,1,0,1Z"/>
+  </g>
+  <g>
+    <path class="cls-1" d="M13.5,15h-3c-.83,0-1.5-.67-1.5-1.5v-3c0-.83.67-1.5,1.5-1.5h2.54l1.96,1.96v2.54c0,.83-.67,1.5-1.5,1.5ZM10.5,10c-.28,0-.5.22-.5.5v3c0,.28.22.5.5.5h3c.28,0,.5-.22.5-.5v-2.13l-1.37-1.37h-2.13Z"/>
+    <path class="cls-1" d="M13,11h-2v-2h2v2ZM11.8,10h.4-.4Z"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/webapp/packages/plugin-datasource-transaction-manager/public/icons/rollback.svg b/webapp/packages/plugin-datasource-transaction-manager/public/icons/rollback.svg
new file mode 100644
index 0000000000..6932be5834
--- /dev/null
+++ b/webapp/packages/plugin-datasource-transaction-manager/public/icons/rollback.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #fff;
+        stroke-width: 0px;
+      }
+    </style>
+  </defs>
+  <path class="cls-1" d="M16.01,30H5.93c-.54,0-1.05-.25-1.41-.67-.33-.38-.51-.89-.51-1.42V4.09c0-.53.18-1.03.51-1.42.36-.42.87-.67,1.41-.67h14.53l7.55,8.62v6.38h-2v-5.62l-6.45-7.38H6.02s-.01.05-.01.09v23.83s0,.07.01.09h9.99v2Z"/>
+  <polygon class="cls-1" points="19.01 24 15.01 21 19.01 18 19.01 24"/>
+  <path class="cls-1" d="M25.01,30h-6v-2h6c1.65,0,3-1.35,3-3s-1.35-3-3-3h-6v-2h6c2.76,0,5,2.24,5,5s-2.24,5-5,5Z"/>
+  <path class="cls-1" d="M27.01,12h-6.01c-1.1,0-1.99-.89-1.99-1.99V3h2v7.01h6s0,1.99,0,1.99Z"/>
+</svg>
\ No newline at end of file
diff --git a/webapp/packages/plugin-datasource-transaction-manager/public/icons/rollback_m.svg b/webapp/packages/plugin-datasource-transaction-manager/public/icons/rollback_m.svg
new file mode 100644
index 0000000000..c469264a9a
--- /dev/null
+++ b/webapp/packages/plugin-datasource-transaction-manager/public/icons/rollback_m.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #fff;
+        stroke-width: 0px;
+      }
+    </style>
+  </defs>
+  <path class="cls-1" d="M12.33,21.41h-6.72c-.38,0-.75-.17-1-.48-.23-.28-.36-.63-.36-1V4.05c0-.37.13-.72.35-1,.26-.31.63-.48,1.01-.48h9.73l5.08,5.8v4.28h-1.5v-3.72l-4.26-4.87H5.75v15.83s6.58,0,6.58,0v1.5Z"/>
+  <polygon class="cls-1" points="14.33 17.33 11.67 15.33 14.33 13.33 14.33 17.33"/>
+  <path class="cls-1" d="M18.33,21.33h-4v-1.33h4c1.1,0,2-.9,2-2s-.9-2-2-2h-4v-1.33h4c1.84,0,3.33,1.5,3.33,3.33s-1.5,3.33-3.33,3.33Z"/>
+  <path class="cls-1" d="M19.67,9.41h-4.01c-.78,0-1.41-.63-1.41-1.41V3.33h1.5v4.58h3.92v1.5Z"/>
+</svg>
\ No newline at end of file
diff --git a/webapp/packages/plugin-datasource-transaction-manager/public/icons/rollback_sm.svg b/webapp/packages/plugin-datasource-transaction-manager/public/icons/rollback_sm.svg
new file mode 100644
index 0000000000..f206366047
--- /dev/null
+++ b/webapp/packages/plugin-datasource-transaction-manager/public/icons/rollback_sm.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #fff;
+        stroke-width: 0px;
+      }
+    </style>
+  </defs>
+  <path class="cls-1" d="M8,15H2.96c-.27,0-.53-.12-.71-.34-.16-.19-.25-.44-.25-.71V2.04c0-.26.09-.52.25-.71.18-.21.44-.34.71-.34h7.25l3.79,3.79v3.21h-1v-2.79l-3.21-3.21H2.96l.04,11.96,5,.04v1Z"/>
+  <polygon class="cls-1" points="10 12 8 10.5 10 9 10 12"/>
+  <path class="cls-1" d="M12.5,15h-2.5v-1h2.5c.83,0,1.5-.67,1.5-1.5s-.67-1.5-1.5-1.5h-2.5v-1h2.5c1.38,0,2.5,1.12,2.5,2.5s-1.12,2.5-2.5,2.5Z"/>
+  <path class="cls-1" d="M13.5,5.5h-3c-.55,0-1-.45-1-1V1.5h1v3h3s0,1,0,1Z"/>
+</svg>
\ No newline at end of file
diff --git a/webapp/packages/plugin-datasource-transaction-manager/src/LocaleService.ts b/webapp/packages/plugin-datasource-transaction-manager/src/LocaleService.ts
new file mode 100644
index 0000000000..edeb82d255
--- /dev/null
+++ b/webapp/packages/plugin-datasource-transaction-manager/src/LocaleService.ts
@@ -0,0 +1,35 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { Bootstrap, injectable } from '@cloudbeaver/core-di';
+import { LocalizationService } from '@cloudbeaver/core-localization';
+
+@injectable()
+export class LocaleService extends Bootstrap {
+  constructor(private readonly localizationService: LocalizationService) {
+    super();
+  }
+
+  register(): void | Promise<void> {
+    this.localizationService.addProvider(this.provider.bind(this));
+  }
+
+  load(): void | Promise<void> {}
+
+  private async provider(locale: string) {
+    switch (locale) {
+      case 'ru':
+        return (await import('./locales/ru')).default;
+      case 'it':
+        return (await import('./locales/it')).default;
+      case 'zh':
+        return (await import('./locales/zh')).default;
+      default:
+        return (await import('./locales/en')).default;
+    }
+  }
+}
diff --git a/webapp/packages/plugin-datasource-transaction-manager/src/TransactionManagerBootstrap.ts b/webapp/packages/plugin-datasource-transaction-manager/src/TransactionManagerBootstrap.ts
new file mode 100644
index 0000000000..8dae08b56c
--- /dev/null
+++ b/webapp/packages/plugin-datasource-transaction-manager/src/TransactionManagerBootstrap.ts
@@ -0,0 +1,212 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { ConfirmationDialog } from '@cloudbeaver/core-blocks';
+import {
+  ConnectionExecutionContext,
+  ConnectionExecutionContextResource,
+  ConnectionExecutionContextService,
+  ConnectionInfoResource,
+  ConnectionsManagerService,
+  createConnectionParam,
+  IConnectionExecutionContextUpdateTaskInfo,
+  IConnectionExecutorData,
+  isConnectionInfoParamEqual,
+} from '@cloudbeaver/core-connections';
+import { Bootstrap, injectable } from '@cloudbeaver/core-di';
+import { CommonDialogService, DialogueStateResult } from '@cloudbeaver/core-dialogs';
+import { NotificationService } from '@cloudbeaver/core-events';
+import { ExecutorInterrupter, type IExecutionContextProvider } from '@cloudbeaver/core-executor';
+import { LocalizationService } from '@cloudbeaver/core-localization';
+import { OptionsPanelService } from '@cloudbeaver/core-ui';
+import { isNotNullDefined } from '@cloudbeaver/core-utils';
+import { ActionService, MenuService } from '@cloudbeaver/core-view';
+import { ConnectionSchemaManagerService } from '@cloudbeaver/plugin-datasource-context-switch';
+import { MENU_APP_ACTIONS } from '@cloudbeaver/plugin-top-app-bar';
+
+import { ACTION_DATASOURCE_TRANSACTION_COMMIT } from './actions/ACTION_DATASOURCE_TRANSACTION_COMMIT';
+import { ACTION_DATASOURCE_TRANSACTION_COMMIT_MODE_TOGGLE } from './actions/ACTION_DATASOURCE_TRANSACTION_COMMIT_MODE_TOGGLE';
+import { ACTION_DATASOURCE_TRANSACTION_ROLLBACK } from './actions/ACTION_DATASOURCE_TRANSACTION_ROLLBACK';
+
+@injectable()
+export class TransactionManagerBootstrap extends Bootstrap {
+  constructor(
+    private readonly menuService: MenuService,
+    private readonly actionService: ActionService,
+    private readonly connectionSchemaManagerService: ConnectionSchemaManagerService,
+    private readonly connectionExecutionContextService: ConnectionExecutionContextService,
+    private readonly connectionExecutionContextResource: ConnectionExecutionContextResource,
+    private readonly connectionInfoResource: ConnectionInfoResource,
+    private readonly connectionsManagerService: ConnectionsManagerService,
+    private readonly optionsPanelService: OptionsPanelService,
+    private readonly notificationService: NotificationService,
+    private readonly commonDialogService: CommonDialogService,
+    private readonly localizationService: LocalizationService,
+  ) {
+    super();
+  }
+
+  register() {
+    this.connectionsManagerService.onDisconnect.addHandler(this.disconnectHandler.bind(this));
+
+    this.menuService.addCreator({
+      menus: [MENU_APP_ACTIONS],
+      isApplicable: () => {
+        const transaction = this.getContextTransaction();
+
+        return (
+          !this.optionsPanelService.active &&
+          this.connectionSchemaManagerService.currentConnection?.connected === true &&
+          !!transaction?.context &&
+          isNotNullDefined(transaction.autoCommit)
+        );
+      },
+      getItems: (_, items) => [
+        ...items,
+        ACTION_DATASOURCE_TRANSACTION_COMMIT,
+        ACTION_DATASOURCE_TRANSACTION_ROLLBACK,
+        ACTION_DATASOURCE_TRANSACTION_COMMIT_MODE_TOGGLE,
+      ],
+    });
+
+    this.actionService.addHandler({
+      id: 'commit-mode-base',
+      isActionApplicable: (_, action) =>
+        [ACTION_DATASOURCE_TRANSACTION_COMMIT, ACTION_DATASOURCE_TRANSACTION_ROLLBACK, ACTION_DATASOURCE_TRANSACTION_COMMIT_MODE_TOGGLE].includes(
+          action,
+        ),
+      isLabelVisible: (_, action) => action === ACTION_DATASOURCE_TRANSACTION_COMMIT || action === ACTION_DATASOURCE_TRANSACTION_ROLLBACK,
+      getActionInfo: (_, action) => {
+        const transaction = this.getContextTransaction();
+
+        if (!transaction) {
+          return action.info;
+        }
+
+        if (action === ACTION_DATASOURCE_TRANSACTION_COMMIT_MODE_TOGGLE) {
+          const auto = transaction.autoCommit;
+          const icon = `/icons/commit_mode_${auto ? 'auto' : 'manual'}_m.svg`;
+          const label = `plugin_datasource_transaction_manager_commit_mode_switch_to_${auto ? 'manual' : 'auto'}`;
+
+          return { ...action.info, icon, label, tooltip: label };
+        }
+
+        return action.info;
+      },
+      isDisabled: () => {
+        const transaction = this.getContextTransaction();
+        return transaction?.executing === true;
+      },
+      isHidden: (_, action) => {
+        const transaction = this.getContextTransaction();
+
+        if (!transaction) {
+          return true;
+        }
+
+        if (action === ACTION_DATASOURCE_TRANSACTION_COMMIT || action === ACTION_DATASOURCE_TRANSACTION_ROLLBACK) {
+          return transaction.autoCommit === true;
+        }
+
+        return false;
+      },
+      handler: async (_, action) => {
+        const transaction = this.getContextTransaction();
+
+        if (!transaction) {
+          return;
+        }
+
+        switch (action) {
+          case ACTION_DATASOURCE_TRANSACTION_COMMIT: {
+            await this.commit(transaction);
+            break;
+          }
+          case ACTION_DATASOURCE_TRANSACTION_ROLLBACK: {
+            try {
+              const result = await transaction.rollback();
+              this.showTransactionResult(transaction, result);
+            } catch (exception: any) {
+              this.notificationService.logException(exception, 'plugin_datasource_transaction_manager_rollback_fail');
+            }
+
+            break;
+          }
+          case ACTION_DATASOURCE_TRANSACTION_COMMIT_MODE_TOGGLE:
+            try {
+              await transaction.setAutoCommit(!transaction.autoCommit);
+              await this.connectionExecutionContextResource.refresh();
+            } catch (exception: any) {
+              this.notificationService.logException(exception, 'plugin_datasource_transaction_manager_commit_mode_fail');
+            }
+
+            break;
+        }
+      },
+    });
+  }
+
+  private showTransactionResult(transaction: ConnectionExecutionContext, info: IConnectionExecutionContextUpdateTaskInfo) {
+    if (!transaction.context) {
+      return;
+    }
+
+    const connectionParam = createConnectionParam(transaction.context.projectId, transaction.context.connectionId);
+    const connection = this.connectionInfoResource.get(connectionParam);
+    const message = typeof info.result === 'string' ? info.result : '';
+
+    this.notificationService.logInfo({ title: connection?.name ?? info.name ?? '', message });
+  }
+
+  private getContextTransaction() {
+    const context = this.connectionSchemaManagerService.activeExecutionContext;
+
+    if (!context) {
+      return;
+    }
+
+    return this.connectionExecutionContextService.get(context.id);
+  }
+
+  private async disconnectHandler(data: IConnectionExecutorData, contexts: IExecutionContextProvider<IConnectionExecutorData>) {
+    if (data.state === 'before') {
+      for (const connectionKey of data.connections) {
+        const context = this.connectionExecutionContextResource.values.find(connection => isConnectionInfoParamEqual(connection, connectionKey));
+
+        if (context) {
+          const transaction = this.connectionExecutionContextService.get(context.id);
+
+          if (transaction?.autoCommit === false) {
+            const connectionData = this.connectionInfoResource.get(connectionKey);
+            const state = await this.commonDialogService.open(ConfirmationDialog, {
+              title: `${this.localizationService.translate('plugin_datasource_transaction_manager_commit')} (${connectionData?.name ?? context.id})`,
+              message: 'plugin_datasource_transaction_manager_commit_confirmation_message',
+              confirmActionText: 'plugin_datasource_transaction_manager_commit',
+              extraStatus: 'no',
+            });
+
+            if (state === DialogueStateResult.Resolved) {
+              await this.commit(transaction, () => ExecutorInterrupter.interrupt(contexts));
+            } else if (state === DialogueStateResult.Rejected) {
+              ExecutorInterrupter.interrupt(contexts);
+            }
+          }
+        }
+      }
+    }
+  }
+
+  private async commit(transaction: ConnectionExecutionContext, onError?: (exception: any) => void) {
+    try {
+      const result = await transaction.commit();
+      this.showTransactionResult(transaction, result);
+    } catch (exception: any) {
+      this.notificationService.logException(exception, 'plugin_datasource_transaction_manager_commit_fail');
+      onError?.(exception);
+    }
+  }
+}
diff --git a/webapp/packages/plugin-datasource-transaction-manager/src/actions/ACTION_DATASOURCE_TRANSACTION_COMMIT.ts b/webapp/packages/plugin-datasource-transaction-manager/src/actions/ACTION_DATASOURCE_TRANSACTION_COMMIT.ts
new file mode 100644
index 0000000000..ed5c81d8d9
--- /dev/null
+++ b/webapp/packages/plugin-datasource-transaction-manager/src/actions/ACTION_DATASOURCE_TRANSACTION_COMMIT.ts
@@ -0,0 +1,14 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { createAction } from '@cloudbeaver/core-view';
+
+export const ACTION_DATASOURCE_TRANSACTION_COMMIT = createAction('datasource-transaction-commit', {
+  label: 'plugin_datasource_transaction_manager_commit',
+  tooltip: 'plugin_datasource_transaction_manager_commit',
+  icon: '/icons/commit_m.svg',
+});
diff --git a/webapp/packages/plugin-datasource-transaction-manager/src/actions/ACTION_DATASOURCE_TRANSACTION_COMMIT_MODE_TOGGLE.ts b/webapp/packages/plugin-datasource-transaction-manager/src/actions/ACTION_DATASOURCE_TRANSACTION_COMMIT_MODE_TOGGLE.ts
new file mode 100644
index 0000000000..66f485f534
--- /dev/null
+++ b/webapp/packages/plugin-datasource-transaction-manager/src/actions/ACTION_DATASOURCE_TRANSACTION_COMMIT_MODE_TOGGLE.ts
@@ -0,0 +1,14 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { createAction } from '@cloudbeaver/core-view';
+
+export const ACTION_DATASOURCE_TRANSACTION_COMMIT_MODE_TOGGLE = createAction('datasource-transaction-commit-mode-toggle', {
+  label: 'plugin_datasource_transaction_manager_commit_mode_switch_to_manual',
+  tooltip: 'plugin_datasource_transaction_manager_commit_mode_switch_to_manual',
+  icon: '/icons/commit_mode_auto_m.svg',
+});
diff --git a/webapp/packages/plugin-datasource-transaction-manager/src/actions/ACTION_DATASOURCE_TRANSACTION_ROLLBACK.ts b/webapp/packages/plugin-datasource-transaction-manager/src/actions/ACTION_DATASOURCE_TRANSACTION_ROLLBACK.ts
new file mode 100644
index 0000000000..e801026795
--- /dev/null
+++ b/webapp/packages/plugin-datasource-transaction-manager/src/actions/ACTION_DATASOURCE_TRANSACTION_ROLLBACK.ts
@@ -0,0 +1,14 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import { createAction } from '@cloudbeaver/core-view';
+
+export const ACTION_DATASOURCE_TRANSACTION_ROLLBACK = createAction('datasource-transaction-rollback', {
+  label: 'plugin_datasource_transaction_manager_rollback',
+  tooltip: 'plugin_datasource_transaction_manager_rollback',
+  icon: '/icons/rollback_m.svg',
+});
diff --git a/webapp/packages/plugin-datasource-transaction-manager/src/index.ts b/webapp/packages/plugin-datasource-transaction-manager/src/index.ts
new file mode 100644
index 0000000000..08e0384d3c
--- /dev/null
+++ b/webapp/packages/plugin-datasource-transaction-manager/src/index.ts
@@ -0,0 +1 @@
+export { datasourceTransactionManagerPlugin } from './manifest';
diff --git a/webapp/packages/plugin-datasource-transaction-manager/src/locales/en.ts b/webapp/packages/plugin-datasource-transaction-manager/src/locales/en.ts
new file mode 100644
index 0000000000..f113567706
--- /dev/null
+++ b/webapp/packages/plugin-datasource-transaction-manager/src/locales/en.ts
@@ -0,0 +1,10 @@
+export default [
+  ['plugin_datasource_transaction_manager_commit', 'Commit'],
+  ['plugin_datasource_transaction_manager_rollback', 'Rollback'],
+  ['plugin_datasource_transaction_manager_commit_mode_switch_to_auto', 'Switch to auto-commit'],
+  ['plugin_datasource_transaction_manager_commit_mode_switch_to_manual', 'Switch to manual commit'],
+  ['plugin_datasource_transaction_manager_commit_fail', 'Failed to commit transaction'],
+  ['plugin_datasource_transaction_manager_rollback_fail', 'Failed to rollback transaction'],
+  ['plugin_datasource_transaction_manager_commit_mode_fail', 'Failed to change commit mode'],
+  ['plugin_datasource_transaction_manager_commit_confirmation_message', 'Do you want to commit changes?'],
+];
diff --git a/webapp/packages/plugin-datasource-transaction-manager/src/locales/it.ts b/webapp/packages/plugin-datasource-transaction-manager/src/locales/it.ts
new file mode 100644
index 0000000000..f113567706
--- /dev/null
+++ b/webapp/packages/plugin-datasource-transaction-manager/src/locales/it.ts
@@ -0,0 +1,10 @@
+export default [
+  ['plugin_datasource_transaction_manager_commit', 'Commit'],
+  ['plugin_datasource_transaction_manager_rollback', 'Rollback'],
+  ['plugin_datasource_transaction_manager_commit_mode_switch_to_auto', 'Switch to auto-commit'],
+  ['plugin_datasource_transaction_manager_commit_mode_switch_to_manual', 'Switch to manual commit'],
+  ['plugin_datasource_transaction_manager_commit_fail', 'Failed to commit transaction'],
+  ['plugin_datasource_transaction_manager_rollback_fail', 'Failed to rollback transaction'],
+  ['plugin_datasource_transaction_manager_commit_mode_fail', 'Failed to change commit mode'],
+  ['plugin_datasource_transaction_manager_commit_confirmation_message', 'Do you want to commit changes?'],
+];
diff --git a/webapp/packages/plugin-datasource-transaction-manager/src/locales/ru.ts b/webapp/packages/plugin-datasource-transaction-manager/src/locales/ru.ts
new file mode 100644
index 0000000000..921b0e3d58
--- /dev/null
+++ b/webapp/packages/plugin-datasource-transaction-manager/src/locales/ru.ts
@@ -0,0 +1,10 @@
+export default [
+  ['plugin_datasource_transaction_manager_commit', 'Commit'],
+  ['plugin_datasource_transaction_manager_rollback', 'Rollback'],
+  ['plugin_datasource_transaction_manager_commit_mode_switch_to_auto', 'Переключить в авто-коммит'],
+  ['plugin_datasource_transaction_manager_commit_mode_switch_to_manual', 'Переключить в ручной коммит'],
+  ['plugin_datasource_transaction_manager_commit_fail', 'Не удалось выполнить коммит'],
+  ['plugin_datasource_transaction_manager_rollback_fail', 'Не удалось выполнить откат'],
+  ['plugin_datasource_transaction_manager_commit_mode_fail', 'Не удалось переключить режим коммита'],
+  ['plugin_datasource_transaction_manager_commit_confirmation_message', 'Вы хотите зафиксировать изменения?'],
+];
diff --git a/webapp/packages/plugin-datasource-transaction-manager/src/locales/zh.ts b/webapp/packages/plugin-datasource-transaction-manager/src/locales/zh.ts
new file mode 100644
index 0000000000..f113567706
--- /dev/null
+++ b/webapp/packages/plugin-datasource-transaction-manager/src/locales/zh.ts
@@ -0,0 +1,10 @@
+export default [
+  ['plugin_datasource_transaction_manager_commit', 'Commit'],
+  ['plugin_datasource_transaction_manager_rollback', 'Rollback'],
+  ['plugin_datasource_transaction_manager_commit_mode_switch_to_auto', 'Switch to auto-commit'],
+  ['plugin_datasource_transaction_manager_commit_mode_switch_to_manual', 'Switch to manual commit'],
+  ['plugin_datasource_transaction_manager_commit_fail', 'Failed to commit transaction'],
+  ['plugin_datasource_transaction_manager_rollback_fail', 'Failed to rollback transaction'],
+  ['plugin_datasource_transaction_manager_commit_mode_fail', 'Failed to change commit mode'],
+  ['plugin_datasource_transaction_manager_commit_confirmation_message', 'Do you want to commit changes?'],
+];
diff --git a/webapp/packages/plugin-datasource-transaction-manager/src/manifest.ts b/webapp/packages/plugin-datasource-transaction-manager/src/manifest.ts
new file mode 100644
index 0000000000..b46508e305
--- /dev/null
+++ b/webapp/packages/plugin-datasource-transaction-manager/src/manifest.ts
@@ -0,0 +1,19 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+import type { PluginManifest } from '@cloudbeaver/core-di';
+
+import { LocaleService } from './LocaleService';
+import { TransactionManagerBootstrap } from './TransactionManagerBootstrap';
+
+export const datasourceTransactionManagerPlugin: PluginManifest = {
+  info: {
+    name: 'Datasource transaction manager plugin',
+  },
+
+  providers: [TransactionManagerBootstrap, LocaleService],
+};
diff --git a/webapp/packages/plugin-datasource-transaction-manager/tsconfig.json b/webapp/packages/plugin-datasource-transaction-manager/tsconfig.json
new file mode 100644
index 0000000000..f336f7ca0b
--- /dev/null
+++ b/webapp/packages/plugin-datasource-transaction-manager/tsconfig.json
@@ -0,0 +1,55 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "dist",
+    "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo"
+  },
+  "references": [
+    {
+      "path": "../core-connections/tsconfig.json"
+    },
+    {
+      "path": "../core-di/tsconfig.json"
+    },
+    {
+      "path": "../core-events/tsconfig.json"
+    },
+    {
+      "path": "../core-executor/tsconfig.json"
+    },
+    {
+      "path": "../core-localization/tsconfig.json"
+    },
+    {
+      "path": "../core-sdk/tsconfig.json"
+    },
+    {
+      "path": "../core-ui/tsconfig.json"
+    },
+    {
+      "path": "../core-utils/tsconfig.json"
+    },
+    {
+      "path": "../core-view/tsconfig.json"
+    },
+    {
+      "path": "../plugin-datasource-context-switch/tsconfig.json"
+    },
+    {
+      "path": "../plugin-top-app-bar/tsconfig.json"
+    }
+  ],
+  "include": [
+    "__custom_mocks__/**/*",
+    "src/**/*",
+    "src/**/*.json",
+    "src/**/*.css",
+    "src/**/*.scss"
+  ],
+  "exclude": [
+    "**/node_modules",
+    "lib/**/*",
+    "dist/**/*"
+  ]
+}
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectViewerTabService.ts b/webapp/packages/plugin-object-viewer/src/ObjectViewerTabService.ts
index cf2696bc03..720faaec96 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectViewerTabService.ts
+++ b/webapp/packages/plugin-object-viewer/src/ObjectViewerTabService.ts
@@ -10,12 +10,15 @@ import { action, makeObservable, runInAction } from 'mobx';
 import { importLazyComponent } from '@cloudbeaver/core-blocks';
 import {
   Connection,
+  ConnectionExecutionContextResource,
   ConnectionInfoActiveProjectKey,
   ConnectionInfoResource,
   ConnectionNavNodeService,
   connectionProvider,
   createConnectionParam,
+  executionContextProvider,
   IConnectionInfoParams,
+  isConnectionInfoParamEqual,
   objectCatalogProvider,
   objectSchemaProvider,
 } from '@cloudbeaver/core-connections';
@@ -55,6 +58,7 @@ export class ObjectViewerTabService {
     private readonly connectionInfoResource: ConnectionInfoResource,
     private readonly connectionNavNodeService: ConnectionNavNodeService,
     private readonly navTreeResource: NavTreeResource,
+    private readonly connectionExecutionContextResource: ConnectionExecutionContextResource,
   ) {
     this.tabHandler = this.navigationTabsService.registerTabHandler<IObjectViewerTabState>({
       key: objectViewerTabHandlerKey,
@@ -71,6 +75,7 @@ export class ObjectViewerTabService {
         connectionProvider(this.getConnection.bind(this)),
         objectCatalogProvider(this.getDBObjectCatalog.bind(this)),
         objectSchemaProvider(this.getDBObjectSchema.bind(this)),
+        executionContextProvider(this.getExecutionContext.bind(this)),
       ],
     });
 
@@ -329,6 +334,16 @@ export class ObjectViewerTabService {
     return nodeInfo.schemaId;
   }
 
+  private getExecutionContext(context: ITab<IObjectViewerTabState>) {
+    const connectionKey = context.handlerState.connectionKey;
+
+    if (!connectionKey) {
+      return;
+    }
+
+    return this.connectionExecutionContextResource.values.find(connection => isConnectionInfoParamEqual(connection, connectionKey));
+  }
+
   private selectObjectTab(tab: ITab<IObjectViewerTabState>) {
     if (tab.handlerState.error) {
       return;
diff --git a/webapp/packages/plugin-sql-editor-navigation-tab/src/SqlEditorTabService.ts b/webapp/packages/plugin-sql-editor-navigation-tab/src/SqlEditorTabService.ts
index b1e9c41be9..a4d7857fd1 100644
--- a/webapp/packages/plugin-sql-editor-navigation-tab/src/SqlEditorTabService.ts
+++ b/webapp/packages/plugin-sql-editor-navigation-tab/src/SqlEditorTabService.ts
@@ -18,6 +18,7 @@ import {
   ConnectionsManagerService,
   ContainerResource,
   createConnectionParam,
+  executionContextProvider,
   ICatalogData,
   IConnectionExecutorData,
   IConnectionInfoParams,
@@ -95,6 +96,7 @@ export class SqlEditorTabService extends Bootstrap {
         connectionProvider(this.getConnectionId.bind(this)),
         objectCatalogProvider(this.getObjectCatalogId.bind(this)),
         objectSchemaProvider(this.getObjectSchemaId.bind(this)),
+        executionContextProvider(this.getExecutionContext.bind(this)),
         projectSetter(this.setProjectId.bind(this)),
         connectionSetter((connectionId, tab) => this.setConnectionId(tab, connectionId)),
         objectCatalogSetter(this.setObjectCatalogId.bind(this)),
@@ -339,6 +341,11 @@ export class SqlEditorTabService extends Bootstrap {
     return context?.defaultSchema;
   }
 
+  private getExecutionContext(tab: ITab<ISqlEditorTabState>) {
+    const dataSource = this.sqlDataSourceService.get(tab.handlerState.editorId);
+    return dataSource?.executionContext;
+  }
+
   private setProjectId(projectId: string | null, tab: ITab<ISqlEditorTabState>): boolean {
     const dataSource = this.sqlDataSourceService.get(tab.handlerState.editorId);
 
diff --git a/webapp/packages/product-default/package.json b/webapp/packages/product-default/package.json
index e13634bb09..d3ab34b6bf 100644
--- a/webapp/packages/product-default/package.json
+++ b/webapp/packages/product-default/package.json
@@ -46,6 +46,7 @@
     "@cloudbeaver/plugin-data-viewer": "~0.1.0",
     "@cloudbeaver/plugin-data-viewer-result-set-grouping": "~0.1.0",
     "@cloudbeaver/plugin-datasource-context-switch": "~0.1.0",
+    "@cloudbeaver/plugin-datasource-transaction-manager": "~0.1.0",
     "@cloudbeaver/plugin-ddl-viewer": "~0.1.0",
     "@cloudbeaver/plugin-devtools": "~0.1.0",
     "@cloudbeaver/plugin-gis-viewer": "~0.1.0",
diff --git a/webapp/packages/product-default/src/index.ts b/webapp/packages/product-default/src/index.ts
index 70751df971..b4b13d7e6b 100644
--- a/webapp/packages/product-default/src/index.ts
+++ b/webapp/packages/product-default/src/index.ts
@@ -17,6 +17,7 @@ import { dataSpreadsheetNewManifest } from '@cloudbeaver/plugin-data-spreadsheet
 import { dataViewerManifest } from '@cloudbeaver/plugin-data-viewer';
 import { dvResultSetGroupingPlugin } from '@cloudbeaver/plugin-data-viewer-result-set-grouping';
 import { datasourceContextSwitchPluginManifest } from '@cloudbeaver/plugin-datasource-context-switch';
+import { datasourceTransactionManagerPlugin } from '@cloudbeaver/plugin-datasource-transaction-manager';
 import ddlViewer from '@cloudbeaver/plugin-ddl-viewer';
 import devTools from '@cloudbeaver/plugin-devtools';
 import gisViewer from '@cloudbeaver/plugin-gis-viewer';
@@ -106,6 +107,7 @@ const PLUGINS: PluginManifest[] = [
   root,
   sessionExpirationPlugin,
   toolsPanel,
+  datasourceTransactionManagerPlugin,
   projects,
   browserPlugin,
   navigationTreeFilters,
diff --git a/webapp/packages/product-default/tsconfig.json b/webapp/packages/product-default/tsconfig.json
index ead0ffaad6..0f5134c4b2 100644
--- a/webapp/packages/product-default/tsconfig.json
+++ b/webapp/packages/product-default/tsconfig.json
@@ -69,6 +69,9 @@
     {
       "path": "../plugin-datasource-context-switch/tsconfig.json"
     },
+    {
+      "path": "../plugin-datasource-transaction-manager/tsconfig.json"
+    },
     {
       "path": "../plugin-ddl-viewer/tsconfig.json"
     },