diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ad1ea299..c285d511b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ Magento Functional Testing Framework Changelog
 ### Fixes
 
 * Fixed issue where an extended data entity would not merge array items. Array items should merge properly now.
+* Fixed issue where Chrome remains running after MFTF suite finishes.
 
 3.0.0 RC3
 ---------
diff --git a/composer.json b/composer.json
index ebc7065bb..c94ca7e0a 100755
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/magento2-functional-testing-framework",
     "description": "Magento2 Functional Testing Framework",
     "type": "library",
-    "version": "3.0.0-RC3",
+    "version": "3.0.0-RC4",
     "license": "AGPL-3.0",
     "keywords": ["magento", "automation", "functional", "testing"],
     "config": {
diff --git a/composer.lock b/composer.lock
index 1006d1973..f98e1db13 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "67a2c5f33cfd03674f7db80019817fb5",
+    "content-hash": "98d36dbb7c244643cd4f2bd83fa391d6",
     "packages": [
         {
             "name": "allure-framework/allure-codeception",
@@ -896,16 +896,6 @@
                 "dependency",
                 "package"
             ],
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-04-10T09:44:22+00:00"
         },
         {
@@ -1994,12 +1984,6 @@
                 "sftp",
                 "storage"
             ],
-            "funding": [
-                {
-                    "url": "https://offset.earth/frankdejonge",
-                    "type": "other"
-                }
-            ],
             "time": "2020-04-16T13:21:26+00:00"
         },
         {
@@ -3219,16 +3203,6 @@
                 "testing",
                 "xunit"
             ],
-            "funding": [
-                {
-                    "url": "https://phpunit.de/donate.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-04-23T04:42:05+00:00"
         },
         {
@@ -3642,12 +3616,6 @@
             ],
             "description": "Collection of value objects that represent the PHP code units",
             "homepage": "https://github.com/sebastianbergmann/code-unit",
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-03-30T11:59:20+00:00"
         },
         {
@@ -4506,20 +4474,6 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-03-30T11:41:10+00:00"
         },
         {
@@ -4573,20 +4527,6 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-03-27T16:56:45+00:00"
         },
         {
@@ -4657,20 +4597,6 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-03-27T16:54:36+00:00"
         },
         {
@@ -4779,20 +4705,6 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-03-27T16:56:45+00:00"
         },
         {
@@ -4842,20 +4754,6 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-03-27T16:56:45+00:00"
         },
         {
@@ -4911,20 +4809,6 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-03-30T14:14:32+00:00"
         },
         {
@@ -4987,20 +4871,6 @@
                 "mime",
                 "mime-type"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-03-27T16:56:45+00:00"
         },
         {
@@ -5059,20 +4929,6 @@
                 "polyfill",
                 "portable"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-02-27T09:26:54+00:00"
         },
         {
@@ -5135,20 +4991,6 @@
                 "portable",
                 "shim"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-03-09T19:04:49+00:00"
         },
         {
@@ -5208,20 +5050,6 @@
                 "portable",
                 "shim"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-03-09T19:04:49+00:00"
         },
         {
@@ -5277,20 +5105,6 @@
                 "portable",
                 "shim"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-02-27T09:26:54+00:00"
         },
         {
@@ -5349,20 +5163,6 @@
                 "portable",
                 "shim"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-02-27T09:26:54+00:00"
         },
         {
@@ -5412,20 +5212,6 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-03-27T16:54:36+00:00"
         },
         {
@@ -5543,20 +5329,6 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-03-30T11:41:10+00:00"
         },
         {
@@ -5786,12 +5558,6 @@
                 "env",
                 "environment"
             ],
-            "funding": [
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-04-12T15:11:38+00:00"
         },
         {
@@ -6854,20 +6620,6 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-03-27T16:54:36+00:00"
         },
         {
@@ -6941,20 +6693,6 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-03-30T10:09:30+00:00"
         },
         {
@@ -7004,20 +6742,6 @@
             ],
             "description": "Symfony Stopwatch Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-03-15T09:38:08+00:00"
         },
         {
@@ -7074,6 +6798,5 @@
         "ext-json": "*",
         "ext-openssl": "*"
     },
-    "platform-dev": [],
-    "plugin-api-version": "1.1.0"
+    "platform-dev": []
 }
diff --git a/dev/tests/verification/Resources/functionalSuiteHooks.txt b/dev/tests/verification/Resources/functionalSuiteHooks.txt
index 908cff8aa..3b5f6bae0 100644
--- a/dev/tests/verification/Resources/functionalSuiteHooks.txt
+++ b/dev/tests/verification/Resources/functionalSuiteHooks.txt
@@ -2,8 +2,10 @@
 
 namespace Group;
 
+use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Magento\FunctionalTestingFramework\DataGenerator\Handlers\PersistedObjectHandler;
 use Magento\FunctionalTestingFramework\DataGenerator\Handlers\CredentialStore;
+use Magento\FunctionalTestingFramework\Module\MagentoWebDriver;
 
 /**
  * Group class is Codeception Extension which is allowed to handle to all internal events.
@@ -41,17 +43,15 @@ class functionalSuiteHooks extends \Codeception\GroupObject
         if ($this->currentTestRun == 1) {
             print sprintf(self::$HOOK_EXECUTION_INIT, "before");
 
+            /** @var MagentoWebDriver $webDriver */
+            $webDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver');
+
             try {
-                $webDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver');
-                
-                // close any open sessions
                 if ($webDriver->webDriver != null) {
-                    $webDriver->webDriver->close();
-                    $webDriver->webDriver = null;
+                    $webDriver->_restart();
+                } else {
+                    $webDriver->_initializeSession();
                 }
-                
-                // initialize the webdriver session
-                $webDriver->_initializeSession();
                 $webDriver->amOnPage("some.url"); // stepKey: before
                 $createFields['someKey'] = "dataHere";
                 PersistedObjectHandler::getInstance()->createEntity(
@@ -64,16 +64,15 @@ class functionalSuiteHooks extends \Codeception\GroupObject
                 print("Entering Action Group [AC] actionGroupWithTwoArguments");
                 $webDriver->see("John", msq("uniqueData") . "John"); // stepKey: seeFirstNameAC
                 print("Exiting Action Group [AC] actionGroupWithTwoArguments");
-
-                // reset configuration and close session
-                $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver')->_resetConfig();
-                $webDriver->webDriver->close();
-                $webDriver->webDriver = null;
-
             } catch (\Exception $exception) {
                 $this->preconditionFailure = $exception->getMessage();
             }
 
+            // reset configuration and close session
+            $webDriver->_resetConfig();
+            $webDriver->webDriver->close();
+            $webDriver->webDriver = null;
+
             print sprintf(self::$HOOK_EXECUTION_END, "before");
         }
     }
@@ -89,6 +88,9 @@ class functionalSuiteHooks extends \Codeception\GroupObject
         if ($this->currentTestRun == $this->testCount) {
             print sprintf(self::$HOOK_EXECUTION_INIT, "after");
 
+            /** @var MagentoWebDriver $webDriver */
+            $webDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver');
+
             try {
                 // Find out if Test in Suite failed, will cause potential failures in suite after
                 $cest = $e->getTest();
@@ -111,16 +113,11 @@ class functionalSuiteHooks extends \Codeception\GroupObject
                         }
                     }
                 }
-                $webDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver');
-                
-                // close any open sessions
                 if ($webDriver->webDriver != null) {
-                    $webDriver->webDriver->close();
-                    $webDriver->webDriver = null;
+                    $webDriver->_restart();
+                } else {
+                    $webDriver->_initializeSession();
                 }
-                
-                // initialize the webdriver session
-                $webDriver->_initializeSession();
                 $webDriver->amOnPage("some.url"); // stepKey: after
                 $webDriver->deleteEntityByUrl("deleteThis"); // stepKey: delete
                 print("Entering Action Group [AC] actionGroupWithTwoArguments");
@@ -131,7 +128,37 @@ class functionalSuiteHooks extends \Codeception\GroupObject
             }
 
             PersistedObjectHandler::getInstance()->clearSuiteObjects();
+
+            $this->closeSession($webDriver);
+
             print sprintf(self::$HOOK_EXECUTION_END, "after");
         }
     }
+
+    /**
+     * Close session method closes current session.
+     * If config 'close_all_sessions' is set to 'true' all sessions will be closed.
+     *
+     * @param MagentoWebDriver $webDriver
+     * return void
+     */
+    private function closeSession(MagentoWebDriver $webDriver): void
+    {
+        $webDriverConfig = $webDriver->_getConfig();
+        $webDriver->_closeSession();
+        if (isset($webDriverConfig['close_all_sessions']) && $webDriverConfig['close_all_sessions'] === "true") {
+            $wdHost = sprintf(
+                '%s://%s:%s%s',
+                $webDriverConfig['protocol'],
+                $webDriverConfig['host'],
+                $webDriverConfig['port'],
+                $webDriverConfig['path']
+            );
+            $availableSessions = RemoteWebDriver::getAllSessions($wdHost);
+            foreach ($availableSessions as $session) {
+                $remoteWebDriver = RemoteWebDriver::createBySessionID($session['id'], $wdHost);
+                $remoteWebDriver->quit();
+            }
+        }
+    }
 }
diff --git a/dev/tests/verification/Resources/functionalSuiteWithComments.txt b/dev/tests/verification/Resources/functionalSuiteWithComments.txt
index 0e15b7909..c8523d0c1 100644
--- a/dev/tests/verification/Resources/functionalSuiteWithComments.txt
+++ b/dev/tests/verification/Resources/functionalSuiteWithComments.txt
@@ -2,8 +2,10 @@
 
 namespace Group;
 
+use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Magento\FunctionalTestingFramework\DataGenerator\Handlers\PersistedObjectHandler;
 use Magento\FunctionalTestingFramework\DataGenerator\Handlers\CredentialStore;
+use Magento\FunctionalTestingFramework\Module\MagentoWebDriver;
 
 /**
  * Group class is Codeception Extension which is allowed to handle to all internal events.
@@ -41,17 +43,15 @@ class functionalSuiteWithComments extends \Codeception\GroupObject
         if ($this->currentTestRun == 1) {
             print sprintf(self::$HOOK_EXECUTION_INIT, "before");
 
+            /** @var MagentoWebDriver $webDriver */
+            $webDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver');
+
             try {
-                $webDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver');
-                
-                // close any open sessions
                 if ($webDriver->webDriver != null) {
-                    $webDriver->webDriver->close();
-                    $webDriver->webDriver = null;
+                    $webDriver->_restart();
+                } else {
+                    $webDriver->_initializeSession();
                 }
-                
-                // initialize the webdriver session
-                $webDriver->_initializeSession();
                 print("Comment in Before");
                 $webDriver->amOnPage("some.url"); // stepKey: before
                 $createFields['someKey'] = "dataHere";
@@ -66,16 +66,15 @@ class functionalSuiteWithComments extends \Codeception\GroupObject
                 print("Entering Action Group [AC] actionGroupWithTwoArguments");
                 $webDriver->see("John", msq("uniqueData") . "John"); // stepKey: seeFirstNameAC
                 print("Exiting Action Group [AC] actionGroupWithTwoArguments");
-
-                // reset configuration and close session
-                $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver')->_resetConfig();
-                $webDriver->webDriver->close();
-                $webDriver->webDriver = null;
-
             } catch (\Exception $exception) {
                 $this->preconditionFailure = $exception->getMessage();
             }
 
+            // reset configuration and close session
+            $webDriver->_resetConfig();
+            $webDriver->webDriver->close();
+            $webDriver->webDriver = null;
+
             print sprintf(self::$HOOK_EXECUTION_END, "before");
         }
     }
@@ -91,6 +90,9 @@ class functionalSuiteWithComments extends \Codeception\GroupObject
         if ($this->currentTestRun == $this->testCount) {
             print sprintf(self::$HOOK_EXECUTION_INIT, "after");
 
+            /** @var MagentoWebDriver $webDriver */
+            $webDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver');
+
             try {
                 // Find out if Test in Suite failed, will cause potential failures in suite after
                 $cest = $e->getTest();
@@ -113,23 +115,48 @@ class functionalSuiteWithComments extends \Codeception\GroupObject
                         }
                     }
                 }
-                $webDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver');
-                
-                // close any open sessions
                 if ($webDriver->webDriver != null) {
-                    $webDriver->webDriver->close();
-                    $webDriver->webDriver = null;
+                    $webDriver->_restart();
+                } else {
+                    $webDriver->_initializeSession();
                 }
-                
-                // initialize the webdriver session
-                $webDriver->_initializeSession();
                 print("afterBlock");
             } catch (\Exception $exception) {
                 print $exception->getMessage();
             }
 
             PersistedObjectHandler::getInstance()->clearSuiteObjects();
+
+            $this->closeSession($webDriver);
+
             print sprintf(self::$HOOK_EXECUTION_END, "after");
         }
     }
+
+    /**
+     * Close session method closes current session.
+     * If config 'close_all_sessions' is set to 'true' all sessions will be closed.
+     *
+     * @param MagentoWebDriver $webDriver
+     * return void
+     */
+    private function closeSession(MagentoWebDriver $webDriver): void
+    {
+        $webDriverConfig = $webDriver->_getConfig();
+        $webDriver->_closeSession();
+        if (isset($webDriverConfig['close_all_sessions']) && $webDriverConfig['close_all_sessions'] === "true") {
+            $wdHost = sprintf(
+                '%s://%s:%s%s',
+                $webDriverConfig['protocol'],
+                $webDriverConfig['host'],
+                $webDriverConfig['port'],
+                $webDriverConfig['path']
+            );
+            $availableSessions = RemoteWebDriver::getAllSessions($wdHost);
+            foreach ($availableSessions as $session) {
+                $remoteWebDriver = RemoteWebDriver::createBySessionID($session['id'], $wdHost);
+                $remoteWebDriver->quit();
+            }
+        }
+    }
 }
diff --git a/docs/configuration.md b/docs/configuration.md
index d2ce5e1a5..5a912b66c 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -321,6 +321,16 @@ Enables addition of browser logs to Allure steps
 ENABLE_BROWSER_LOG=true
 ```
 
+### SELENIUM_CLOSE_ALL_SESSIONS
+
+Forces MFTF to close all Selenium sessions after running a suite.
+
+Use this if you're having issues with sessions hanging in an MFTF suite.
+
+```conf
+SELENIUM_CLOSE_ALL_SESSIONS=true
+```
+
 ### BROWSER_LOG_BLACKLIST
 
 Blacklists types of browser log entries from appearing in Allure steps.
diff --git a/etc/config/.env.example b/etc/config/.env.example
index 86df31b3d..5597e08b5 100644
--- a/etc/config/.env.example
+++ b/etc/config/.env.example
@@ -21,6 +21,7 @@ MAGENTO_ADMIN_PASSWORD=123123q
 #SELENIUM_PORT=4444
 #SELENIUM_PROTOCOL=http
 #SELENIUM_PATH=/wd/hub
+SELENIUM_CLOSE_ALL_SESSIONS=true
 
 #*** Browser for running tests, default chrome. Uncomment and change if you want to run tests on another browser (ex. firefox).
 BROWSER=chrome
diff --git a/etc/config/functional.suite.dist.yml b/etc/config/functional.suite.dist.yml
index 3254b728d..fefcec410 100644
--- a/etc/config/functional.suite.dist.yml
+++ b/etc/config/functional.suite.dist.yml
@@ -34,6 +34,7 @@ modules:
             port: "%SELENIUM_PORT%"
             protocol: "%SELENIUM_PROTOCOL%"
             path: "%SELENIUM_PATH%"
+            close_all_sessions: "%SELENIUM_CLOSE_ALL_SESSIONS%"
             capabilities:
                 unhandledPromptBehavior: "ignore"
                 chromeOptions:
diff --git a/src/Magento/FunctionalTestingFramework/Suite/views/SuiteClass.mustache b/src/Magento/FunctionalTestingFramework/Suite/views/SuiteClass.mustache
index 0e60437ee..a9fdcd6df 100644
--- a/src/Magento/FunctionalTestingFramework/Suite/views/SuiteClass.mustache
+++ b/src/Magento/FunctionalTestingFramework/Suite/views/SuiteClass.mustache
@@ -2,8 +2,10 @@
 
 namespace Group;
 
+use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Magento\FunctionalTestingFramework\DataGenerator\Handlers\PersistedObjectHandler;
 use Magento\FunctionalTestingFramework\DataGenerator\Handlers\CredentialStore;
+use Magento\FunctionalTestingFramework\Module\MagentoWebDriver;
 
 /**
  * Group class is Codeception Extension which is allowed to handle to all internal events.
@@ -55,18 +57,20 @@ class {{suiteName}} extends \Codeception\GroupObject
         if ($this->currentTestRun == 1) {
             print sprintf(self::$HOOK_EXECUTION_INIT, "before");
 
+            /** @var MagentoWebDriver $webDriver */
+            $webDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver');
+
             try {
                 {{> testActions}}
-
-                // reset configuration and close session
-                $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver')->_resetConfig();
-                $webDriver->webDriver->close();
-                $webDriver->webDriver = null;
-
             } catch (\Exception $exception) {
                 $this->preconditionFailure = $exception->getMessage();
             }
 
+            // reset configuration and close session
+            $webDriver->_resetConfig();
+            $webDriver->webDriver->close();
+            $webDriver->webDriver = null;
+
             print sprintf(self::$HOOK_EXECUTION_END, "before");
         }
     }
@@ -84,6 +88,9 @@ class {{suiteName}} extends \Codeception\GroupObject
         if ($this->currentTestRun == $this->testCount) {
             print sprintf(self::$HOOK_EXECUTION_INIT, "after");
 
+            /** @var MagentoWebDriver $webDriver */
+            $webDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver');
+
             try {
                 // Find out if Test in Suite failed, will cause potential failures in suite after
                 $cest = $e->getTest();
@@ -112,8 +119,38 @@ class {{suiteName}} extends \Codeception\GroupObject
             }
 
             PersistedObjectHandler::getInstance()->clearSuiteObjects();
+
+            $this->closeSession($webDriver);
+
             print sprintf(self::$HOOK_EXECUTION_END, "after");
         }
     }
     {{/after}}
+
+    /**
+     * Close session method closes current session.
+     * If config 'close_all_sessions' is set to 'true' all sessions will be closed.
+     *
+     * @param MagentoWebDriver $webDriver
+     * return void
+     */
+    private function closeSession(MagentoWebDriver $webDriver): void
+    {
+        $webDriverConfig = $webDriver->_getConfig();
+        $webDriver->_closeSession();
+        if (isset($webDriverConfig['close_all_sessions']) && $webDriverConfig['close_all_sessions'] === "true") {
+            $wdHost = sprintf(
+                '%s://%s:%s%s',
+                $webDriverConfig['protocol'],
+                $webDriverConfig['host'],
+                $webDriverConfig['port'],
+                $webDriverConfig['path']
+            );
+            $availableSessions = RemoteWebDriver::getAllSessions($wdHost);
+            foreach ($availableSessions as $session) {
+                $remoteWebDriver = RemoteWebDriver::createBySessionID($session['id'], $wdHost);
+                $remoteWebDriver->quit();
+            }
+        }
+    }
 }
diff --git a/src/Magento/FunctionalTestingFramework/Suite/views/partials/testActions.mustache b/src/Magento/FunctionalTestingFramework/Suite/views/partials/testActions.mustache
index 2ed5e8d5e..73079f169 100644
--- a/src/Magento/FunctionalTestingFramework/Suite/views/partials/testActions.mustache
+++ b/src/Magento/FunctionalTestingFramework/Suite/views/partials/testActions.mustache
@@ -1,15 +1,10 @@
 {{#actions}}
 {{#webDriverInit}}
-$webDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver');
-
-// close any open sessions
 if ($webDriver->webDriver != null) {
-    $webDriver->webDriver->close();
-    $webDriver->webDriver = null;
+    $webDriver->_restart();
+} else {
+    $webDriver->_initializeSession();
 }
-
-// initialize the webdriver session
-$webDriver->_initializeSession();
 {{/webDriverInit}}
 {{#action}}
 {{{action}}}