diff --git a/java/compiler/impl/BUILD.bazel b/java/compiler/impl/BUILD.bazel
index 8fd75a5f170e..8b9463f61097 100644
--- a/java/compiler/impl/BUILD.bazel
+++ b/java/compiler/impl/BUILD.bazel
@@ -13,6 +13,7 @@ jvm_library(
     "//platform/util/concurrency",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//jps/model-api:model",
     "//jps/model-serialization",
     "//platform/lang-core",
diff --git a/java/compiler/impl/intellij.java.compiler.impl.iml b/java/compiler/impl/intellij.java.compiler.impl.iml
index a6acf573cb2b..ab113de7dae5 100644
--- a/java/compiler/impl/intellij.java.compiler.impl.iml
+++ b/java/compiler/impl/intellij.java.compiler.impl.iml
@@ -13,6 +13,7 @@
     <orderEntry type="module" module-name="intellij.platform.concurrency" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
     <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
     <orderEntry type="module" module-name="intellij.platform.lang.core" />
diff --git a/java/debugger/impl/BUILD.bazel b/java/debugger/impl/BUILD.bazel
index 309fc0795bc1..af6953cfacea 100644
--- a/java/debugger/impl/BUILD.bazel
+++ b/java/debugger/impl/BUILD.bazel
@@ -23,6 +23,7 @@ jvm_library(
     "//platform/core-api:core",
     "//platform/xdebugger-impl:debugger-impl",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
     "//platform/lang-api:lang",
diff --git a/java/debugger/impl/intellij.java.debugger.impl.iml b/java/debugger/impl/intellij.java.debugger.impl.iml
index 91ff1b5b9887..5c8d2b8abf9b 100644
--- a/java/debugger/impl/intellij.java.debugger.impl.iml
+++ b/java/debugger/impl/intellij.java.debugger.impl.iml
@@ -39,6 +39,7 @@
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.debugger.impl" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
diff --git a/java/execution/backend/BUILD.bazel b/java/execution/backend/BUILD.bazel
index b0e9120ea2dd..dac225303d28 100644
--- a/java/execution/backend/BUILD.bazel
+++ b/java/execution/backend/BUILD.bazel
@@ -19,6 +19,7 @@ jvm_library(
     "//java/execution/impl",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/kernel/backend",
     "//platform/platform-api:ide",
     "//platform/platform-impl/rpc",
diff --git a/java/execution/backend/intellij.java.execution.impl.backend.iml b/java/execution/backend/intellij.java.execution.impl.backend.iml
index 4de126798ab7..b6d91859db9f 100644
--- a/java/execution/backend/intellij.java.execution.impl.backend.iml
+++ b/java/execution/backend/intellij.java.execution.impl.backend.iml
@@ -41,6 +41,7 @@
     <orderEntry type="module" module-name="intellij.platform.backend" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.kernel.backend" />
     <orderEntry type="module" module-name="intellij.platform.ide" />
     <orderEntry type="module" module-name="intellij.platform.ide.rpc" />
diff --git a/java/execution/impl/BUILD.bazel b/java/execution/impl/BUILD.bazel
index e82f62d90424..c8c9c53a7f91 100644
--- a/java/execution/impl/BUILD.bazel
+++ b/java/execution/impl/BUILD.bazel
@@ -28,6 +28,7 @@ jvm_library(
     "//platform/util/concurrency",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/platform-impl:ide-impl",
     "//java/execution/openapi:java-execution",
     "//java/java-runtime:rt",
diff --git a/java/execution/impl/intellij.java.execution.impl.iml b/java/execution/impl/intellij.java.execution.impl.iml
index 0ce71f148381..2a9920ce2176 100644
--- a/java/execution/impl/intellij.java.execution.impl.iml
+++ b/java/execution/impl/intellij.java.execution.impl.iml
@@ -13,6 +13,7 @@
     <orderEntry type="module" module-name="intellij.platform.concurrency" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.java.execution" exported="" />
     <orderEntry type="module" module-name="intellij.java.rt" />
diff --git a/java/java-features-trainer/BUILD.bazel b/java/java-features-trainer/BUILD.bazel
index 88ff0e301c49..f112d9f7df4e 100644
--- a/java/java-features-trainer/BUILD.bazel
+++ b/java/java-features-trainer/BUILD.bazel
@@ -20,6 +20,7 @@ jvm_library(
     "//platform/analysis-api:analysis",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/ide-core-impl",
     "//java/java-impl:impl",
     "//java/idea-ui:ui",
@@ -52,6 +53,7 @@ jvm_library(
     "//platform/analysis-api:analysis",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/ide-core-impl",
     "//java/java-impl:impl",
     "//java/idea-ui:ui",
diff --git a/java/java-features-trainer/intellij.java.featuresTrainer.iml b/java/java-features-trainer/intellij.java.featuresTrainer.iml
index 0a9b8461650f..b4b29378437c 100644
--- a/java/java-features-trainer/intellij.java.featuresTrainer.iml
+++ b/java/java-features-trainer/intellij.java.featuresTrainer.iml
@@ -16,6 +16,7 @@
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
     <orderEntry type="module" module-name="intellij.java.impl" />
     <orderEntry type="module" module-name="intellij.java.ui" />
diff --git a/java/java-impl/BUILD.bazel b/java/java-impl/BUILD.bazel
index 1ee17b346c30..54027300ded0 100644
--- a/java/java-impl/BUILD.bazel
+++ b/java/java-impl/BUILD.bazel
@@ -95,7 +95,6 @@ jvm_library(
   ],
   exports = [
     "//platform/lang-impl",
-    "//platform/execution-impl",
     "//java/java-psi-impl:psi-impl",
     "//java/java-frontback-impl:frontback-impl",
     "//java/java-indexing-impl:indexing-impl",
diff --git a/java/java-impl/intellij.java.impl.iml b/java/java-impl/intellij.java.impl.iml
index 3fe1de7abcdc..454b6157e0d8 100644
--- a/java/java-impl/intellij.java.impl.iml
+++ b/java/java-impl/intellij.java.impl.iml
@@ -34,7 +34,7 @@
     <orderEntry type="module" module-name="intellij.platform.vcs" />
     <orderEntry type="module" module-name="intellij.platform.ide.codeinsight.inline" />
     <orderEntry type="module" module-name="intellij.platform.usageView" />
-    <orderEntry type="module" module-name="intellij.platform.execution.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.jsp" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
     <orderEntry type="module" module-name="intellij.jsp.spi" />
diff --git a/java/java-tests/BUILD.bazel b/java/java-tests/BUILD.bazel
index 11c7e75f391d..200048dc9d2b 100644
--- a/java/java-tests/BUILD.bazel
+++ b/java/java-tests/BUILD.bazel
@@ -24,6 +24,7 @@ jvm_library(
     "//platform/util/concurrency",
     "//platform/util/concurrency:concurrency_test_lib",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/foldings",
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
diff --git a/java/java-tests/intellij.java.tests.iml b/java/java-tests/intellij.java.tests.iml
index ab2109d1a57b..cfdd2dc90ea2 100644
--- a/java/java-tests/intellij.java.tests.iml
+++ b/java/java-tests/intellij.java.tests.iml
@@ -13,6 +13,7 @@
     <orderEntry type="module" module-name="intellij.platform.analysis" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.concurrency" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.foldings" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.indexing" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
diff --git a/jvm/jvm-analysis-internal-testFramework/BUILD.bazel b/jvm/jvm-analysis-internal-testFramework/BUILD.bazel
index c6b7df377a02..ced320fe65b5 100644
--- a/jvm/jvm-analysis-internal-testFramework/BUILD.bazel
+++ b/jvm/jvm-analysis-internal-testFramework/BUILD.bazel
@@ -12,6 +12,7 @@ jvm_library(
     "//platform/analysis-api:analysis",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//jps/model-api:model",
     "//platform/lang-core",
     "//platform/projectModel-api:projectModel",
diff --git a/jvm/jvm-analysis-internal-testFramework/intellij.jvm.analysis.internal.testFramework.iml b/jvm/jvm-analysis-internal-testFramework/intellij.jvm.analysis.internal.testFramework.iml
index 40644c2109b6..87f60076ab54 100644
--- a/jvm/jvm-analysis-internal-testFramework/intellij.jvm.analysis.internal.testFramework.iml
+++ b/jvm/jvm-analysis-internal-testFramework/intellij.jvm.analysis.internal.testFramework.iml
@@ -12,6 +12,7 @@
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
     <orderEntry type="module" module-name="intellij.platform.lang.core" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
diff --git a/platform/lang-impl/BUILD.bazel b/platform/lang-impl/BUILD.bazel
index 511d61183cce..92b406bbbd67 100644
--- a/platform/lang-impl/BUILD.bazel
+++ b/platform/lang-impl/BUILD.bazel
@@ -157,6 +157,7 @@ jvm_library(
     "//platform/util/concurrency:concurrency_test_lib",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//jps/model-api:model",
     "//jps/model-serialization",
     "//platform/lang-api:lang",
diff --git a/platform/lang-impl/intellij.platform.lang.tests.iml b/platform/lang-impl/intellij.platform.lang.tests.iml
index bff4b005626d..897a908a9787 100644
--- a/platform/lang-impl/intellij.platform.lang.tests.iml
+++ b/platform/lang-impl/intellij.platform.lang.tests.iml
@@ -12,6 +12,7 @@
     <orderEntry type="module" module-name="intellij.platform.concurrency" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.lang" exported="" />
diff --git a/platform/platform-tests/BUILD.bazel b/platform/platform-tests/BUILD.bazel
index a3a503f6d8f9..871f959e6604 100644
--- a/platform/platform-tests/BUILD.bazel
+++ b/platform/platform-tests/BUILD.bazel
@@ -26,6 +26,7 @@ jvm_library(
     "//platform/credential-store",
     "//platform/diff-api:diff",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/foldings",
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
diff --git a/platform/platform-tests/intellij.platform.tests.iml b/platform/platform-tests/intellij.platform.tests.iml
index b1bf1a43f2e5..c6358fd20514 100644
--- a/platform/platform-tests/intellij.platform.tests.iml
+++ b/platform/platform-tests/intellij.platform.tests.iml
@@ -16,6 +16,7 @@
     <orderEntry type="module" module-name="intellij.platform.credentialStore" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.diff" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.foldings" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.indexing" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
diff --git a/platform/remote-servers/target-integration-tests/BUILD.bazel b/platform/remote-servers/target-integration-tests/BUILD.bazel
index 6e9ec0b31860..a865ede4d0e6 100644
--- a/platform/remote-servers/target-integration-tests/BUILD.bazel
+++ b/platform/remote-servers/target-integration-tests/BUILD.bazel
@@ -20,6 +20,7 @@ jvm_library(
     "//platform/analysis-api:analysis",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//jps/model-api:model",
     "//platform/lang-core",
     "//platform/projectModel-api:projectModel",
diff --git a/platform/remote-servers/target-integration-tests/intellij.platform.remoteServers.targetsIntegrationTests.iml b/platform/remote-servers/target-integration-tests/intellij.platform.remoteServers.targetsIntegrationTests.iml
index 55a5d3cbdfab..550526d2cc98 100644
--- a/platform/remote-servers/target-integration-tests/intellij.platform.remoteServers.targetsIntegrationTests.iml
+++ b/platform/remote-servers/target-integration-tests/intellij.platform.remoteServers.targetsIntegrationTests.iml
@@ -14,6 +14,7 @@
     <orderEntry type="module" module-name="intellij.platform.analysis" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.lang.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
diff --git a/platform/script-debugger/debugger-ui/BUILD.bazel b/platform/script-debugger/debugger-ui/BUILD.bazel
index 0d2c8f43a445..897d5d86a26f 100644
--- a/platform/script-debugger/debugger-ui/BUILD.bazel
+++ b/platform/script-debugger/debugger-ui/BUILD.bazel
@@ -27,7 +27,6 @@ jvm_library(
     "//platform/platform-util-io:ide-util-io",
     "//platform/platform-util-netty:ide-util-netty",
     "//platform/util/jdom",
-  ],
-  exports = ["//platform/execution-impl"]
+  ]
 )
 ### auto-generated section `build intellij.platform.scriptDebugger.ui` end
\ No newline at end of file
diff --git a/platform/script-debugger/debugger-ui/intellij.platform.scriptDebugger.ui.iml b/platform/script-debugger/debugger-ui/intellij.platform.scriptDebugger.ui.iml
index eb1415195ae9..4357d0587298 100644
--- a/platform/script-debugger/debugger-ui/intellij.platform.scriptDebugger.ui.iml
+++ b/platform/script-debugger/debugger-ui/intellij.platform.scriptDebugger.ui.iml
@@ -18,7 +18,7 @@
     <orderEntry type="module" module-name="intellij.platform.scriptDebugger.backend" />
     <orderEntry type="module" module-name="intellij.platform.debugger.impl" />
     <orderEntry type="library" name="Guava" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.execution.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="library" name="netty-codec-http" level="project" />
     <orderEntry type="module" module-name="intellij.platform.debugger.testFramework" scope="TEST" />
     <orderEntry type="library" name="fastutil-min" level="project" />
diff --git a/platform/smRunner/BUILD.bazel b/platform/smRunner/BUILD.bazel
index 93b86e378ae4..ff4cec4fb278 100644
--- a/platform/smRunner/BUILD.bazel
+++ b/platform/smRunner/BUILD.bazel
@@ -36,7 +36,6 @@ jvm_library(
     "//platform/util/jdom",
   ],
   exports = [
-    "//platform/execution-impl",
     "//platform/testRunner",
     "@lib//:tc_service_messages",
   ],
diff --git a/platform/smRunner/intellij.platform.smRunner.iml b/platform/smRunner/intellij.platform.smRunner.iml
index 37625a0874e3..c5bab9285c6a 100644
--- a/platform/smRunner/intellij.platform.smRunner.iml
+++ b/platform/smRunner/intellij.platform.smRunner.iml
@@ -15,7 +15,7 @@
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
-    <orderEntry type="module" module-name="intellij.platform.execution.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.lvcs" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
diff --git a/platform/testFramework/BUILD.bazel b/platform/testFramework/BUILD.bazel
index cb67fa8d5d46..8d751098c6a2 100644
--- a/platform/testFramework/BUILD.bazel
+++ b/platform/testFramework/BUILD.bazel
@@ -98,7 +98,6 @@ jvm_library(
     "@lib//:junit5-provided",
     "@lib//:junit5Params-provided",
     "//libraries/junit4",
-    "//platform/execution-impl",
     "//platform/ide-core-impl",
     "//platform/platform-impl:ide-impl",
     "//platform/testFramework/common",
diff --git a/platform/testFramework/extensions/BUILD.bazel b/platform/testFramework/extensions/BUILD.bazel
index 06dea20eb953..c5486fe91924 100644
--- a/platform/testFramework/extensions/BUILD.bazel
+++ b/platform/testFramework/extensions/BUILD.bazel
@@ -18,6 +18,7 @@ jvm_library(
     "//platform/core-api:core",
     "//platform/core-impl",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/projectModel-api:projectModel",
     "//platform/util",
     "//platform/util-ex",
diff --git a/platform/testFramework/extensions/intellij.platform.testExtensions.iml b/platform/testFramework/extensions/intellij.platform.testExtensions.iml
index b7972bdee5bd..b609bb95ff99 100644
--- a/platform/testFramework/extensions/intellij.platform.testExtensions.iml
+++ b/platform/testFramework/extensions/intellij.platform.testExtensions.iml
@@ -13,6 +13,7 @@
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.platform.util.ex" />
diff --git a/platform/testFramework/intellij.platform.testFramework.iml b/platform/testFramework/intellij.platform.testFramework.iml
index 6ca60edfda2a..1c468f8616e3 100644
--- a/platform/testFramework/intellij.platform.testFramework.iml
+++ b/platform/testFramework/intellij.platform.testFramework.iml
@@ -39,7 +39,7 @@
     <orderEntry type="module" module-name="intellij.platform.diagnostic.telemetry" />
     <orderEntry type="module" module-name="intellij.platform.editor.ex" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
-    <orderEntry type="module" module-name="intellij.platform.execution.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.foldings" />
     <orderEntry type="module" module-name="intellij.platform.ide.codeinsight.inline" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" exported="" />
diff --git a/platform/xdebugger-testFramework/BUILD.bazel b/platform/xdebugger-testFramework/BUILD.bazel
index e39f3bacd0d0..463959a51ebb 100644
--- a/platform/xdebugger-testFramework/BUILD.bazel
+++ b/platform/xdebugger-testFramework/BUILD.bazel
@@ -10,6 +10,7 @@ jvm_library(
     "//platform/util/concurrency",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/projectModel-api:projectModel",
     "//platform/testFramework",
     "//platform/xdebugger-impl:debugger-impl",
diff --git a/platform/xdebugger-testFramework/intellij.platform.debugger.testFramework.iml b/platform/xdebugger-testFramework/intellij.platform.debugger.testFramework.iml
index 0ecaba947462..3e7ac118885f 100644
--- a/platform/xdebugger-testFramework/intellij.platform.debugger.testFramework.iml
+++ b/platform/xdebugger-testFramework/intellij.platform.debugger.testFramework.iml
@@ -10,6 +10,7 @@
     <orderEntry type="module" module-name="intellij.platform.concurrency" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" />
     <orderEntry type="module" module-name="intellij.platform.debugger.impl" />
diff --git a/plugins/coverage/BUILD.bazel b/plugins/coverage/BUILD.bazel
index dcdc7b5abe17..cf3c09f61b8d 100644
--- a/plugins/coverage/BUILD.bazel
+++ b/plugins/coverage/BUILD.bazel
@@ -22,6 +22,7 @@ jvm_library(
     "//java/openapi:java",
     "//java/execution/impl",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//jps/model-api:model",
     "//platform/lang-core",
     "//platform/projectModel-api:projectModel",
@@ -71,6 +72,7 @@ jvm_library(
     "//java/openapi:java",
     "//java/execution/impl",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//jps/model-api:model",
     "//platform/lang-core",
     "//platform/projectModel-api:projectModel",
diff --git a/plugins/coverage/intellij.java.coverage.iml b/plugins/coverage/intellij.java.coverage.iml
index 4bf2eda3622d..879acd6107e2 100644
--- a/plugins/coverage/intellij.java.coverage.iml
+++ b/plugins/coverage/intellij.java.coverage.iml
@@ -65,6 +65,7 @@
     <orderEntry type="module" module-name="intellij.java" exported="" />
     <orderEntry type="module" module-name="intellij.java.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
     <orderEntry type="module" module-name="intellij.platform.lang.core" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
diff --git a/plugins/devkit/devkit-core/BUILD.bazel b/plugins/devkit/devkit-core/BUILD.bazel
index 684fdaa4fe37..b3712f72954c 100644
--- a/plugins/devkit/devkit-core/BUILD.bazel
+++ b/plugins/devkit/devkit-core/BUILD.bazel
@@ -25,6 +25,7 @@ jvm_library(
     "//platform/analysis-api:analysis",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
     "//jps/model-serialization",
diff --git a/plugins/devkit/devkit-core/intellij.devkit.core.iml b/plugins/devkit/devkit-core/intellij.devkit.core.iml
index ff3c09a28a30..8c80c803f529 100644
--- a/plugins/devkit/devkit-core/intellij.devkit.core.iml
+++ b/plugins/devkit/devkit-core/intellij.devkit.core.iml
@@ -36,6 +36,7 @@
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
     <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
diff --git a/plugins/devkit/intellij.devkit.gradle/BUILD.bazel b/plugins/devkit/intellij.devkit.gradle/BUILD.bazel
index f3e5a60b9463..aa20333ed4fd 100644
--- a/plugins/devkit/intellij.devkit.gradle/BUILD.bazel
+++ b/plugins/devkit/intellij.devkit.gradle/BUILD.bazel
@@ -18,6 +18,7 @@ jvm_library(
     "//platform/core-api:core",
     "//platform/core-impl",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/external-system-impl:externalSystem-impl",
     "//platform/platform-util-io:ide-util-io",
     "//platform/ide-core",
@@ -50,6 +51,7 @@ jvm_library(
     "//platform/core-api:core",
     "//platform/core-impl",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/external-system-impl:externalSystem-impl",
     "//platform/platform-util-io:ide-util-io",
     "//platform/ide-core",
diff --git a/plugins/devkit/intellij.devkit.gradle/intellij.devkit.gradle.iml b/plugins/devkit/intellij.devkit.gradle/intellij.devkit.gradle.iml
index 361c115104ff..b948b4c83d31 100644
--- a/plugins/devkit/intellij.devkit.gradle/intellij.devkit.gradle.iml
+++ b/plugins/devkit/intellij.devkit.gradle/intellij.devkit.gradle.iml
@@ -13,6 +13,7 @@
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.externalSystem.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
     <orderEntry type="module" module-name="intellij.platform.ide.core" />
diff --git a/plugins/gradle/BUILD.bazel b/plugins/gradle/BUILD.bazel
index 76ad3e03c64b..2613ed72bef9 100644
--- a/plugins/gradle/BUILD.bazel
+++ b/plugins/gradle/BUILD.bazel
@@ -22,6 +22,7 @@ jvm_library(
     "//platform/analysis-api:analysis",
     "//platform/util/concurrency",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/external-system-api:externalSystem",
     "//platform/observable",
     "//platform/external-system-impl:externalSystem-impl",
@@ -127,6 +128,7 @@ jvm_library(
     "//platform/backend/workspace",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/external-system-api/dependency-updater",
     "//platform/external-system-impl:externalSystem-impl",
     "//platform/observable",
diff --git a/plugins/gradle/intellij.gradle.iml b/plugins/gradle/intellij.gradle.iml
index 0bd93dbb732d..dc05e344d07b 100644
--- a/plugins/gradle/intellij.gradle.iml
+++ b/plugins/gradle/intellij.gradle.iml
@@ -14,6 +14,7 @@
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.concurrency" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.externalSystem" exported="" />
     <orderEntry type="module" module-name="intellij.platform.ide.observable" />
     <orderEntry type="module" module-name="intellij.platform.externalSystem.impl" />
diff --git a/plugins/gradle/intellij.gradle.tests.iml b/plugins/gradle/intellij.gradle.tests.iml
index d002d174e19d..d94a47ad7107 100644
--- a/plugins/gradle/intellij.gradle.tests.iml
+++ b/plugins/gradle/intellij.gradle.tests.iml
@@ -22,6 +22,7 @@
     <orderEntry type="module" module-name="intellij.platform.backend.workspace" />
     <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.externalSystem.dependencyUpdater" />
     <orderEntry type="module" module-name="intellij.platform.externalSystem.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.ide.observable" />
diff --git a/plugins/gradle/java/BUILD.bazel b/plugins/gradle/java/BUILD.bazel
index a747599dc364..941c06babbe5 100644
--- a/plugins/gradle/java/BUILD.bazel
+++ b/plugins/gradle/java/BUILD.bazel
@@ -23,6 +23,7 @@ jvm_library(
     "//platform/util/concurrency",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/external-system-impl:externalSystem-impl",
     "//platform/platform-impl:ide-impl",
     "//java/idea-ui:ui",
@@ -110,6 +111,7 @@ jvm_library(
     "//platform/util/concurrency:concurrency_test_lib",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/external-system-impl:externalSystem-impl",
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
diff --git a/plugins/gradle/java/intellij.gradle.java.iml b/plugins/gradle/java/intellij.gradle.java.iml
index eba3fafb3798..840853c40c93 100644
--- a/plugins/gradle/java/intellij.gradle.java.iml
+++ b/plugins/gradle/java/intellij.gradle.java.iml
@@ -18,6 +18,7 @@
     <orderEntry type="module" module-name="intellij.platform.concurrency" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.externalSystem.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.java.ui" />
diff --git a/plugins/gradle/java/intellij.gradle.java.tests.iml b/plugins/gradle/java/intellij.gradle.java.tests.iml
index 4589bc8d4a34..e72caa50be6d 100644
--- a/plugins/gradle/java/intellij.gradle.java.tests.iml
+++ b/plugins/gradle/java/intellij.gradle.java.tests.iml
@@ -16,6 +16,7 @@
     <orderEntry type="module" module-name="intellij.platform.concurrency" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.externalSystem.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.indexing" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
diff --git a/plugins/groovy/BUILD.bazel b/plugins/groovy/BUILD.bazel
index 47f515123b76..a5f3eaaf22da 100644
--- a/plugins/groovy/BUILD.bazel
+++ b/plugins/groovy/BUILD.bazel
@@ -28,6 +28,7 @@ jvm_library(
     "//platform/util/concurrency",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
     "//platform/lang-core",
@@ -100,6 +101,7 @@ jvm_library(
     "//platform/util/concurrency:concurrency_test_lib",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
     "//platform/lang-core",
diff --git a/plugins/groovy/intellij.groovy.iml b/plugins/groovy/intellij.groovy.iml
index 55ca8b2b7400..066cd5671ad5 100644
--- a/plugins/groovy/intellij.groovy.iml
+++ b/plugins/groovy/intellij.groovy.iml
@@ -12,6 +12,7 @@
     <orderEntry type="module" module-name="intellij.platform.concurrency" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
     <orderEntry type="module" module-name="intellij.platform.lang.core" />
diff --git a/plugins/javaFX/BUILD.bazel b/plugins/javaFX/BUILD.bazel
index 06310c78b421..0231b02ce82b 100644
--- a/plugins/javaFX/BUILD.bazel
+++ b/plugins/javaFX/BUILD.bazel
@@ -17,6 +17,7 @@ jvm_library(
     "//platform/analysis-api:analysis",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
     "//platform/lang-api:lang",
@@ -61,6 +62,7 @@ jvm_library(
     "//platform/analysis-api:analysis",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
     "//platform/lang-api:lang",
diff --git a/plugins/javaFX/intellij.javaFX.iml b/plugins/javaFX/intellij.javaFX.iml
index 227783904ecd..3a3d1b50abd0 100644
--- a/plugins/javaFX/intellij.javaFX.iml
+++ b/plugins/javaFX/intellij.javaFX.iml
@@ -12,6 +12,7 @@
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
diff --git a/plugins/junit/BUILD.bazel b/plugins/junit/BUILD.bazel
index 4dc6c95aea99..b86fc07fb96c 100644
--- a/plugins/junit/BUILD.bazel
+++ b/plugins/junit/BUILD.bazel
@@ -21,6 +21,7 @@ jvm_library(
     "//platform/util/concurrency",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
     "//platform/lang-core",
diff --git a/plugins/junit/intellij.junit.iml b/plugins/junit/intellij.junit.iml
index 896aeae9f4e9..49d21bcd81ea 100644
--- a/plugins/junit/intellij.junit.iml
+++ b/plugins/junit/intellij.junit.iml
@@ -16,6 +16,7 @@
     <orderEntry type="module" module-name="intellij.platform.concurrency" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
     <orderEntry type="module" module-name="intellij.platform.lang.core" />
diff --git a/plugins/junit/java-tests/BUILD.bazel b/plugins/junit/java-tests/BUILD.bazel
index 5833f894e76a..f3381ff98bf1 100644
--- a/plugins/junit/java-tests/BUILD.bazel
+++ b/plugins/junit/java-tests/BUILD.bazel
@@ -17,6 +17,7 @@ jvm_library(
     "//platform/core-api:core",
     "//platform/core-ui",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//jps/model-api:model",
     "//platform/lang-core",
     "//platform/projectModel-api:projectModel",
diff --git a/plugins/junit/java-tests/intellij.junit.java.tests.iml b/plugins/junit/java-tests/intellij.junit.java.tests.iml
index befbf8e9285f..b180c4082de3 100644
--- a/plugins/junit/java-tests/intellij.junit.java.tests.iml
+++ b/plugins/junit/java-tests/intellij.junit.java.tests.iml
@@ -11,6 +11,7 @@
     <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.lang.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
diff --git a/plugins/junit5_rt_tests/BUILD.bazel b/plugins/junit5_rt_tests/BUILD.bazel
index 7e96054bc54a..2fd83282810e 100644
--- a/plugins/junit5_rt_tests/BUILD.bazel
+++ b/plugins/junit5_rt_tests/BUILD.bazel
@@ -20,6 +20,7 @@ jvm_library(
     "//platform/core-api:core",
     "//platform/core-ui",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//jps/model-api:model",
     "//platform/lang-core",
     "//platform/projectModel-api:projectModel",
diff --git a/plugins/junit5_rt_tests/intellij.junit.v5.rt.tests.iml b/plugins/junit5_rt_tests/intellij.junit.v5.rt.tests.iml
index 87f524d5a92b..cec63cd37ed4 100644
--- a/plugins/junit5_rt_tests/intellij.junit.v5.rt.tests.iml
+++ b/plugins/junit5_rt_tests/intellij.junit.v5.rt.tests.iml
@@ -18,6 +18,7 @@
     <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.lang.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
diff --git a/plugins/kotlin/base/fe10/code-insight/BUILD.bazel b/plugins/kotlin/base/fe10/code-insight/BUILD.bazel
index 673e5667ac12..528a16fb165b 100644
--- a/plugins/kotlin/base/fe10/code-insight/BUILD.bazel
+++ b/plugins/kotlin/base/fe10/code-insight/BUILD.bazel
@@ -32,6 +32,7 @@ jvm_library(
     "@lib//:kotlinc-analysis-api",
     "@lib//:guava",
     "//platform/core-api:core",
+    "//platform/execution-impl",
     "//plugins/kotlin/base/util",
     "//plugins/kotlin/base/psi",
     "//plugins/kotlin/base/platforms",
diff --git a/plugins/kotlin/base/fe10/code-insight/kotlin.base.fe10.code-insight.iml b/plugins/kotlin/base/fe10/code-insight/kotlin.base.fe10.code-insight.iml
index efdda2775e39..0675662afdfc 100644
--- a/plugins/kotlin/base/fe10/code-insight/kotlin.base.fe10.code-insight.iml
+++ b/plugins/kotlin/base/fe10/code-insight/kotlin.base.fe10.code-insight.iml
@@ -32,6 +32,7 @@
     <orderEntry type="library" name="kotlinc.analysis-api" level="project" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="kotlin.base.util" />
     <orderEntry type="module" module-name="kotlin.base.psi" />
     <orderEntry type="module" module-name="kotlin.base.platforms" />
diff --git a/plugins/kotlin/base/fir/code-insight/BUILD.bazel b/plugins/kotlin/base/fir/code-insight/BUILD.bazel
index d689acd217d2..191ac7ae23e6 100644
--- a/plugins/kotlin/base/fir/code-insight/BUILD.bazel
+++ b/plugins/kotlin/base/fir/code-insight/BUILD.bazel
@@ -32,6 +32,7 @@ jvm_library(
     "@lib//:kotlinc-kotlin-compiler-ir",
     "@lib//:kotlinc-analysis-api",
     "//platform/core-api:core",
+    "//platform/execution-impl",
     "//plugins/kotlin/base/util",
     "//plugins/kotlin/base/psi",
     "//platform/util",
diff --git a/plugins/kotlin/base/fir/code-insight/kotlin.base.fir.code-insight.iml b/plugins/kotlin/base/fir/code-insight/kotlin.base.fir.code-insight.iml
index 5707c36a3a31..d1cf5eb3de32 100644
--- a/plugins/kotlin/base/fir/code-insight/kotlin.base.fir.code-insight.iml
+++ b/plugins/kotlin/base/fir/code-insight/kotlin.base.fir.code-insight.iml
@@ -30,6 +30,7 @@
     <orderEntry type="library" name="kotlinc.kotlin-compiler-ir" level="project" />
     <orderEntry type="library" name="kotlinc.analysis-api" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="kotlin.base.util" />
     <orderEntry type="module" module-name="kotlin.base.psi" />
     <orderEntry type="module" module-name="intellij.platform.util" />
diff --git a/plugins/kotlin/fir/tests/BUILD.bazel b/plugins/kotlin/fir/tests/BUILD.bazel
index 65372d27c831..bac8fa32b4df 100644
--- a/plugins/kotlin/fir/tests/BUILD.bazel
+++ b/plugins/kotlin/fir/tests/BUILD.bazel
@@ -34,6 +34,7 @@ jvm_library(
     "//platform/analysis-api:analysis",
     "//platform/core-ui",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
     "//platform/lang-core",
diff --git a/plugins/kotlin/fir/tests/kotlin.fir.tests.iml b/plugins/kotlin/fir/tests/kotlin.fir.tests.iml
index 156234eeec45..ce17450c417a 100644
--- a/plugins/kotlin/fir/tests/kotlin.fir.tests.iml
+++ b/plugins/kotlin/fir/tests/kotlin.fir.tests.iml
@@ -33,6 +33,7 @@
     <orderEntry type="module" module-name="intellij.platform.analysis" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.indexing" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.lang.core" scope="TEST" />
diff --git a/plugins/kotlin/gradle/gradle-java/BUILD.bazel b/plugins/kotlin/gradle/gradle-java/BUILD.bazel
index 1c6ea1a4758c..873d38c50f5c 100644
--- a/plugins/kotlin/gradle/gradle-java/BUILD.bazel
+++ b/plugins/kotlin/gradle/gradle-java/BUILD.bazel
@@ -31,6 +31,7 @@ jvm_library(
     "//platform/analysis-api:analysis",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/external-system-impl:externalSystem-impl",
     "//platform/ide-core-impl",
     "@lib//:kotlin-tooling-core",
@@ -102,6 +103,7 @@ jvm_library(
     "//platform/analysis-api:analysis",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/external-system-impl:externalSystem-impl",
     "//platform/ide-core-impl",
     "@lib//:kotlin-tooling-core",
diff --git a/plugins/kotlin/gradle/gradle-java/kotlin.gradle.gradle-java.iml b/plugins/kotlin/gradle/gradle-java/kotlin.gradle.gradle-java.iml
index b6b8a2d9d37b..e342cdd24bdf 100644
--- a/plugins/kotlin/gradle/gradle-java/kotlin.gradle.gradle-java.iml
+++ b/plugins/kotlin/gradle/gradle-java/kotlin.gradle.gradle-java.iml
@@ -32,6 +32,7 @@
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.externalSystem.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
     <orderEntry type="library" name="kotlin-tooling-core" level="project" />
diff --git a/plugins/kotlin/gradle/gradle-java/tests.shared/BUILD.bazel b/plugins/kotlin/gradle/gradle-java/tests.shared/BUILD.bazel
index 54824c09f2d2..d76f5667c2ac 100644
--- a/plugins/kotlin/gradle/gradle-java/tests.shared/BUILD.bazel
+++ b/plugins/kotlin/gradle/gradle-java/tests.shared/BUILD.bazel
@@ -19,6 +19,7 @@ jvm_library(
     "//platform/core-api:core",
     "//platform/core-ui",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/external-system-impl:externalSystem-impl",
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
diff --git a/plugins/kotlin/gradle/gradle-java/tests.shared/kotlin.gradle.gradle-java.tests.shared.iml b/plugins/kotlin/gradle/gradle-java/tests.shared/kotlin.gradle.gradle-java.tests.shared.iml
index c1d9ce33eb2e..63916d38b52c 100644
--- a/plugins/kotlin/gradle/gradle-java/tests.shared/kotlin.gradle.gradle-java.tests.shared.iml
+++ b/plugins/kotlin/gradle/gradle-java/tests.shared/kotlin.gradle.gradle-java.tests.shared.iml
@@ -13,6 +13,7 @@
     <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.externalSystem.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.indexing" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
diff --git a/plugins/kotlin/idea/tests/BUILD.bazel b/plugins/kotlin/idea/tests/BUILD.bazel
index 7afcca3dde90..3e0cee94dee0 100644
--- a/plugins/kotlin/idea/tests/BUILD.bazel
+++ b/plugins/kotlin/idea/tests/BUILD.bazel
@@ -29,6 +29,7 @@ jvm_library(
     "//platform/util/concurrency:concurrency_test_lib",
     "//platform/core-ui",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/external-system-impl:externalSystem-impl",
     "//platform/ide-core-impl",
     "//platform/core-api:core",
diff --git a/plugins/kotlin/idea/tests/kotlin.idea.tests.iml b/plugins/kotlin/idea/tests/kotlin.idea.tests.iml
index ca5b1f28b6fc..af99453346bc 100644
--- a/plugins/kotlin/idea/tests/kotlin.idea.tests.iml
+++ b/plugins/kotlin/idea/tests/kotlin.idea.tests.iml
@@ -28,6 +28,7 @@
     <orderEntry type="module" module-name="intellij.platform.concurrency" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.externalSystem.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
diff --git a/plugins/kotlin/jvm/k1/BUILD.bazel b/plugins/kotlin/jvm/k1/BUILD.bazel
index b5afc81e2e97..a26b57a14ed8 100644
--- a/plugins/kotlin/jvm/k1/BUILD.bazel
+++ b/plugins/kotlin/jvm/k1/BUILD.bazel
@@ -18,6 +18,7 @@ jvm_library(
     "@lib//:kotlinc-analysis-api-fe10",
     "@lib//:kotlinc-kotlin-compiler-fe10",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/lang-core",
     "//plugins/kotlin/base/fe10/analysis",
     "//plugins/kotlin/base/fe10/code-insight",
diff --git a/plugins/kotlin/jvm/k1/kotlin.jvm.k1.iml b/plugins/kotlin/jvm/k1/kotlin.jvm.k1.iml
index 9f74228bf02a..86ec2a40a652 100644
--- a/plugins/kotlin/jvm/k1/kotlin.jvm.k1.iml
+++ b/plugins/kotlin/jvm/k1/kotlin.jvm.k1.iml
@@ -13,6 +13,7 @@
     <orderEntry type="library" name="kotlinc.analysis-api-fe10" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.lang.core" />
     <orderEntry type="module" module-name="kotlin.base.fe10.analysis" />
     <orderEntry type="module" module-name="kotlin.base.fe10.code-insight" />
diff --git a/plugins/kotlin/run-configurations/junit/BUILD.bazel b/plugins/kotlin/run-configurations/junit/BUILD.bazel
index ebfa873533da..0ba5cedeb42f 100644
--- a/plugins/kotlin/run-configurations/junit/BUILD.bazel
+++ b/plugins/kotlin/run-configurations/junit/BUILD.bazel
@@ -17,6 +17,7 @@ jvm_library(
     "@lib//:kotlinc-kotlin-compiler-common",
     "//java/java-indexing-api:indexing",
     "//platform/core-api:core",
+    "//platform/execution-impl",
     "//platform/indexing-api:indexing",
     "//plugins/kotlin/base/util",
     "//plugins/kotlin/base/facet",
diff --git a/plugins/kotlin/run-configurations/junit/kotlin.run-configurations.junit.iml b/plugins/kotlin/run-configurations/junit/kotlin.run-configurations.junit.iml
index 7a113a17d804..9bf3b6a96dc2 100644
--- a/plugins/kotlin/run-configurations/junit/kotlin.run-configurations.junit.iml
+++ b/plugins/kotlin/run-configurations/junit/kotlin.run-configurations.junit.iml
@@ -12,6 +12,7 @@
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
     <orderEntry type="module" module-name="intellij.java.indexing" />
     <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="kotlin.base.util" />
     <orderEntry type="module" module-name="kotlin.base.facet" />
diff --git a/plugins/kotlin/run-configurations/jvm/BUILD.bazel b/plugins/kotlin/run-configurations/jvm/BUILD.bazel
index c92ebb8ae793..246f6e7c6369 100644
--- a/plugins/kotlin/run-configurations/jvm/BUILD.bazel
+++ b/plugins/kotlin/run-configurations/jvm/BUILD.bazel
@@ -18,6 +18,7 @@ jvm_library(
     "@lib//:kotlinc-kotlin-jps-common",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
     "//platform/lang-core",
diff --git a/plugins/kotlin/run-configurations/jvm/kotlin.run-configurations.jvm.iml b/plugins/kotlin/run-configurations/jvm/kotlin.run-configurations.jvm.iml
index 6f3eb5ddc507..dae60ca56802 100644
--- a/plugins/kotlin/run-configurations/jvm/kotlin.run-configurations.jvm.iml
+++ b/plugins/kotlin/run-configurations/jvm/kotlin.run-configurations.jvm.iml
@@ -13,6 +13,7 @@
     <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
     <orderEntry type="module" module-name="intellij.platform.lang.core" />
diff --git a/plugins/kotlin/run-configurations/testng/BUILD.bazel b/plugins/kotlin/run-configurations/testng/BUILD.bazel
index fe046ba94199..f12f6bbf7f63 100644
--- a/plugins/kotlin/run-configurations/testng/BUILD.bazel
+++ b/plugins/kotlin/run-configurations/testng/BUILD.bazel
@@ -16,6 +16,7 @@ jvm_library(
     "@lib//:kotlin-stdlib",
     "@lib//:kotlinc-kotlin-compiler-common",
     "//platform/core-api:core",
+    "//platform/execution-impl",
     "//plugins/kotlin/base/util",
     "//plugins/kotlin/base/facet",
     "//platform/smRunner",
diff --git a/plugins/kotlin/run-configurations/testng/kotlin.run-configurations.testng.iml b/plugins/kotlin/run-configurations/testng/kotlin.run-configurations.testng.iml
index 7d777122960c..64c5ab726b38 100644
--- a/plugins/kotlin/run-configurations/testng/kotlin.run-configurations.testng.iml
+++ b/plugins/kotlin/run-configurations/testng/kotlin.run-configurations.testng.iml
@@ -11,6 +11,7 @@
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="kotlin.base.util" />
     <orderEntry type="module" module-name="kotlin.base.facet" />
     <orderEntry type="module" module-name="intellij.platform.smRunner" />
diff --git a/plugins/maven/BUILD.bazel b/plugins/maven/BUILD.bazel
index a00a6404d2ba..13dd352aa41f 100644
--- a/plugins/maven/BUILD.bazel
+++ b/plugins/maven/BUILD.bazel
@@ -25,6 +25,7 @@ jvm_library(
   deps = [
     "//platform/analysis-api:analysis",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/ide-core-impl",
     "//platform/observable",
     "//java/openapi:java",
diff --git a/plugins/maven/intellij.maven.iml b/plugins/maven/intellij.maven.iml
index 0a7a836f2cd1..d30fc058ae0f 100644
--- a/plugins/maven/intellij.maven.iml
+++ b/plugins/maven/intellij.maven.iml
@@ -12,6 +12,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.observable" />
     <orderEntry type="module" module-name="intellij.java" exported="" />
diff --git a/plugins/maven/src/test/BUILD.bazel b/plugins/maven/src/test/BUILD.bazel
index d93338e13f22..5754284e50a3 100644
--- a/plugins/maven/src/test/BUILD.bazel
+++ b/plugins/maven/src/test/BUILD.bazel
@@ -25,6 +25,7 @@ jvm_library(
     "//platform/core-api:core",
     "//platform/core-ui",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/external-system-impl:externalSystem-impl",
     "//jps/model-api:model",
     "//platform/lang-core",
diff --git a/plugins/maven/src/test/intellij.maven.tests.iml b/plugins/maven/src/test/intellij.maven.tests.iml
index 0afd499fa621..b34bbca08f58 100644
--- a/plugins/maven/src/test/intellij.maven.tests.iml
+++ b/plugins/maven/src/test/intellij.maven.tests.iml
@@ -14,6 +14,7 @@
     <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.externalSystem.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.lang.core" scope="TEST" />
diff --git a/plugins/testng/BUILD.bazel b/plugins/testng/BUILD.bazel
index df6365d01cf8..b48273984859 100644
--- a/plugins/testng/BUILD.bazel
+++ b/plugins/testng/BUILD.bazel
@@ -32,6 +32,7 @@ jvm_library(
     "//platform/util/concurrency",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/platform-impl:ide-impl",
     "//java/debugger/impl",
     "//platform/indexing-api:indexing",
@@ -76,6 +77,7 @@ jvm_library(
     "//platform/util/concurrency:concurrency_test_lib",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/platform-impl:ide-impl",
     "//platform/platform-impl:ide-impl_test_lib",
     "//java/debugger/impl",
diff --git a/plugins/testng/intellij.testng.iml b/plugins/testng/intellij.testng.iml
index 7e24b79aef5d..935efa724036 100644
--- a/plugins/testng/intellij.testng.iml
+++ b/plugins/testng/intellij.testng.iml
@@ -17,6 +17,7 @@
     <orderEntry type="module" module-name="intellij.platform.concurrency" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.java.debugger.impl" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
diff --git a/plugins/testng_rt/tests/BUILD.bazel b/plugins/testng_rt/tests/BUILD.bazel
index 5edc11c382b3..08d532235d59 100644
--- a/plugins/testng_rt/tests/BUILD.bazel
+++ b/plugins/testng_rt/tests/BUILD.bazel
@@ -15,6 +15,7 @@ jvm_library(
   deps = [
     "//java/java-tests:tests_test_lib",
     "//platform/core-api:core",
+    "//platform/execution-impl",
     "//jps/model-api:model",
     "//platform/projectModel-api:projectModel",
     "//platform/testFramework",
diff --git a/plugins/testng_rt/tests/intellij.testng.rt.tests.iml b/plugins/testng_rt/tests/intellij.testng.rt.tests.iml
index 8ed713ee2199..720944806ed4 100644
--- a/plugins/testng_rt/tests/intellij.testng.rt.tests.iml
+++ b/plugins/testng_rt/tests/intellij.testng.rt.tests.iml
@@ -9,6 +9,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.java.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
diff --git a/python/BUILD.bazel b/python/BUILD.bazel
index d6b84a91d206..72363eeb18f1 100644
--- a/python/BUILD.bazel
+++ b/python/BUILD.bazel
@@ -181,6 +181,7 @@ jvm_library(
     "//platform/util/concurrency",
     "//platform/credential-store",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/foldings",
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
@@ -366,6 +367,7 @@ jvm_library(
     "//platform/util/concurrency:concurrency_test_lib",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/execution-impl",
     "//platform/foldings",
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
diff --git a/python/intellij.python.community.impl.iml b/python/intellij.python.community.impl.iml
index 604e0909f061..e1b8b7e8396d 100644
--- a/python/intellij.python.community.impl.iml
+++ b/python/intellij.python.community.impl.iml
@@ -37,6 +37,7 @@
     <orderEntry type="module" module-name="intellij.platform.concurrency" />
     <orderEntry type="module" module-name="intellij.platform.credentialStore" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.foldings" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
diff --git a/python/intellij.python.community.tests.iml b/python/intellij.python.community.tests.iml
index 8e79437df035..9b56abb6c248 100644
--- a/python/intellij.python.community.tests.iml
+++ b/python/intellij.python.community.tests.iml
@@ -14,6 +14,7 @@
     <orderEntry type="module" module-name="intellij.platform.concurrency" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.execution.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.foldings" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.indexing" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />