diff --git a/application/Espo/ORM/Repository/RDBRepository.php b/application/Espo/ORM/Repository/RDBRepository.php
index 42c59be376..3b2c5472e4 100644
--- a/application/Espo/ORM/Repository/RDBRepository.php
+++ b/application/Espo/ORM/Repository/RDBRepository.php
@@ -50,6 +50,8 @@ class RDBRepository extends Repository
 
     protected $hookMediator;
 
+    protected $transactionManager;
+
     public function __construct(
         string $entityType, EntityManager $entityManager, EntityFactory $entityFactory, ?HookMediator $hookMediator = null
     ) {
@@ -62,6 +64,8 @@ class RDBRepository extends Repository
         $this->seed = $this->entityFactory->create($entityType);
 
         $this->hookMediator = $hookMediator ?? (new EmptyHookMediator());
+
+        $this->transactionManager = new RDBTransactionManager($entityManager->getTransactionManager());
     }
 
     protected function getMapper() : Mapper
@@ -639,8 +643,6 @@ class RDBRepository extends Repository
         $builder = new RDBSelectBuilder($this->entityManager, $this->entityType, $query);
 
         return $builder;
-
-        //return $builder->clone($query);
     }
 
     /**
diff --git a/application/Espo/ORM/Repository/RDBTransactionManager.php b/application/Espo/ORM/Repository/RDBTransactionManager.php
new file mode 100644
index 0000000000..fc9cd2dd7c
--- /dev/null
+++ b/application/Espo/ORM/Repository/RDBTransactionManager.php
@@ -0,0 +1,93 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\ORM\Repository;
+
+use Espo\ORM\{
+    TransactionManager,
+};
+
+use RuntimeException;
+
+/**
+ * Wrapper for TransactionManager to be used within RDBRepository in beforeSave and afterSave methods.
+ */
+class RDBTransactionManager
+{
+    protected $transactionManager;
+
+    protected $level = 0;
+
+    public function __construct(TransactionManager $transactionManager)
+    {
+        $this->transactionManager = $transactionManager;
+    }
+
+    public function isStarted() : bool
+    {
+        return $this->level > 0;
+    }
+
+    public function start()
+    {
+        if ($this->isStarted()) {
+            throw new RuntimeException("Can't start a transaction more than once.");
+        }
+
+        $this->transactionManager->start();
+
+        $this->level = $this->transactionManager->getLevel();
+    }
+
+    public function commit()
+    {
+        if (!$this->isStarted()) {
+            throw new RuntimeException("Can't commit not started transaction.");
+        }
+
+        while ($this->transactionManager->getLevel() >= $this->level) {
+            $this->transactionManager->commit();
+        }
+
+        $this->level = 0;
+    }
+
+    public function rollback()
+    {
+        if (!$this->isStarted()) {
+            throw new RuntimeException("Can't rollback not started transaction.");
+        }
+
+        while ($this->transactionManager->getLevel() >= $this->level) {
+            $this->transactionManager->rollback();
+        }
+
+        $this->level = 0;
+    }
+}
diff --git a/tests/unit/Espo/ORM/Repository/RDBTransactionManagerTest.php b/tests/unit/Espo/ORM/Repository/RDBTransactionManagerTest.php
new file mode 100644
index 0000000000..e44b629182
--- /dev/null
+++ b/tests/unit/Espo/ORM/Repository/RDBTransactionManagerTest.php
@@ -0,0 +1,113 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2020 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace tests\unit\Espo\ORM\Repository;
+
+require_once 'tests/unit/testData/DB/Entities.php';
+
+use Espo\ORM\{
+    Repository\RDBTransactionManager,
+    TransactionManager,
+};
+
+use RuntimeException;
+
+class RDBTransactionManagerTest extends \PHPUnit\Framework\TestCase
+{
+    protected function setUp() : void
+    {
+        $this->wrappee = $this->getMockBuilder(TransactionManager::class)->disableOriginalConstructor()->getMock();
+
+        $this->manager = new RDBTransactionManager($this->wrappee);
+    }
+
+
+    public function testStartOnce()
+    {
+
+        $this->wrappee
+            ->expects($this->once())
+            ->method('start');
+
+        $this->manager->start();
+    }
+
+    public function testException()
+    {
+        $this->wrappee
+            ->expects($this->once())
+            ->method('start');
+
+        $this->wrappee
+            ->expects($this->once())
+            ->method('getLevel')
+            ->will($this->returnValue(1));
+
+        $this->expectException(RuntimeException::class);
+
+        $this->manager->start();
+
+        $this->manager->start();
+    }
+
+    public function testCommit()
+    {
+        $this->wrappee
+            ->expects($this->at(0))
+            ->method('start');
+
+        $this->wrappee
+            ->expects($this->at(1))
+            ->method('getLevel')
+            ->will($this->returnValue(1));
+
+        $this->wrappee
+            ->expects($this->at(2))
+            ->method('getLevel')
+            ->will($this->returnValue(2));
+
+        $this->wrappee
+            ->expects($this->at(3))
+            ->method('commit');
+
+        $this->wrappee
+            ->expects($this->at(4))
+            ->method('getLevel')
+            ->will($this->returnValue(1));
+
+        $this->wrappee
+            ->expects($this->at(5))
+            ->method('commit');
+
+
+        $this->manager->start();
+
+        $this->manager->commit();
+    }
+}