diff --git a/build/cucumber-test-runner/BUILD.bazel b/build/cucumber-test-runner/BUILD.bazel
index e5a3e890b30f..7682fd3af5ec 100644
--- a/build/cucumber-test-runner/BUILD.bazel
+++ b/build/cucumber-test-runner/BUILD.bazel
@@ -8,6 +8,7 @@ jvm_library(
   srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True),
   deps = [
     "//platform/core-api:core",
+    "@lib//:kotlin-stdlib",
     "//platform/testFramework",
     "@lib//:cucumber-core-1-provided",
     "//platform/util-class-loader:util-classLoader",
diff --git a/build/cucumber-test-runner/intellij.cucumber.testRunner.iml b/build/cucumber-test-runner/intellij.cucumber.testRunner.iml
index c1c17a8ea8d7..12709a89e627 100644
--- a/build/cucumber-test-runner/intellij.cucumber.testRunner.iml
+++ b/build/cucumber-test-runner/intellij.cucumber.testRunner.iml
@@ -8,6 +8,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" />
     <orderEntry type="library" scope="PROVIDED" name="cucumber-core-1" level="project" />
     <orderEntry type="module" module-name="intellij.cucumber.jvmFormatter" scope="RUNTIME" />
diff --git a/grid/impl-ide/BUILD.bazel b/grid/impl-ide/BUILD.bazel
index 5d56450e32cc..65953b0a0d72 100644
--- a/grid/impl-ide/BUILD.bazel
+++ b/grid/impl-ide/BUILD.bazel
@@ -14,6 +14,7 @@ jvm_library(
   srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True),
   resources = [":impl-ide_resources"],
   deps = [
+    "@lib//:kotlin-stdlib",
     "//platform/core-api:core",
     "//platform/core-ui",
     "//platform/ide-core",
diff --git a/grid/impl-ide/intellij.grid.impl.ide.iml b/grid/impl-ide/intellij.grid.impl.ide.iml
index d003f8382d34..cca53bbfe37f 100644
--- a/grid/impl-ide/intellij.grid.impl.ide.iml
+++ b/grid/impl-ide/intellij.grid.impl.ide.iml
@@ -8,6 +8,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.ide.core" />
diff --git a/idea/customization/base/BUILD.bazel b/idea/customization/base/BUILD.bazel
index 4a4162ba8ea3..168ee328124b 100644
--- a/idea/customization/base/BUILD.bazel
+++ b/idea/customization/base/BUILD.bazel
@@ -14,6 +14,7 @@ jvm_library(
   srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True),
   resources = [":base_resources"],
   deps = [
+    "@lib//:kotlin-stdlib",
     "//platform/platform-impl:ide-impl",
     "//platform/platform-util-io:ide-util-io",
   ]
diff --git a/idea/customization/base/intellij.idea.customization.base.iml b/idea/customization/base/intellij.idea.customization.base.iml
index ad7fa0368d27..7867495ede89 100644
--- a/idea/customization/base/intellij.idea.customization.base.iml
+++ b/idea/customization/base/intellij.idea.customization.base.iml
@@ -8,6 +8,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
   </component>
diff --git a/java/ide-customization/BUILD.bazel b/java/ide-customization/BUILD.bazel
index 355868f234c1..7d7ae7025630 100644
--- a/java/ide-customization/BUILD.bazel
+++ b/java/ide-customization/BUILD.bazel
@@ -15,6 +15,7 @@ jvm_library(
   resources = [":ide-customization_resources"],
   deps = [
     "//java/java-psi-api:psi",
+    "@lib//:kotlin-stdlib",
     "//platform/core-api:core",
     "//platform/lang-api:lang",
     "//platform/platform-impl:ide-impl",
@@ -38,6 +39,7 @@ jvm_library(
   associates = [":ide-customization"],
   deps = [
     "//java/java-psi-api:psi",
+    "@lib//:kotlin-stdlib",
     "//platform/core-api:core",
     "//platform/lang-api:lang",
     "//platform/platform-impl:ide-impl",
diff --git a/java/ide-customization/intellij.java.ide.customization.iml b/java/ide-customization/intellij.java.ide.customization.iml
index 072baf309993..761d468506f0 100644
--- a/java/ide-customization/intellij.java.ide.customization.iml
+++ b/java/ide-customization/intellij.java.ide.customization.iml
@@ -10,6 +10,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.java.psi" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" scope="RUNTIME" />
diff --git a/java/java-promo/BUILD.bazel b/java/java-promo/BUILD.bazel
index 5b089f3c07aa..34110146ef27 100644
--- a/java/java-promo/BUILD.bazel
+++ b/java/java-promo/BUILD.bazel
@@ -16,6 +16,7 @@ jvm_library(
   deps = [
     "//platform/lang-core",
     "//platform/util",
+    "@lib//:kotlin-stdlib",
     "//java/openapi:java",
     "//java/idea-ui:ui",
     "//platform/platform-impl:ide-impl",
diff --git a/java/java-promo/intellij.java.promo.iml b/java/java-promo/intellij.java.promo.iml
index 074e12bab2f8..95ebe6a5722a 100644
--- a/java/java-promo/intellij.java.promo.iml
+++ b/java/java-promo/intellij.java.promo.iml
@@ -10,6 +10,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.lang.core" />
     <orderEntry type="module" module-name="intellij.platform.util" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.java" />
     <orderEntry type="module" module-name="intellij.java.ui" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
diff --git a/jps/model-serialization/BUILD.bazel b/jps/model-serialization/BUILD.bazel
index 1fe3587ca70a..e985c26311ab 100644
--- a/jps/model-serialization/BUILD.bazel
+++ b/jps/model-serialization/BUILD.bazel
@@ -56,6 +56,7 @@ jvm_library(
     "//jps/model-serialization",
     "//jps/model-impl:model-tests_test_lib",
     "//platform/testFramework/extensions:testExtensions",
+    "@lib//:kotlin-stdlib",
     "@lib//:assert_j",
     "//platform/testFramework",
     "//platform/testFramework:testFramework_test_lib",
diff --git a/jps/model-serialization/intellij.platform.jps.model.serialization.tests.iml b/jps/model-serialization/intellij.platform.jps.model.serialization.tests.iml
index 34f4899366b8..baa78d5da626 100644
--- a/jps/model-serialization/intellij.platform.jps.model.serialization.tests.iml
+++ b/jps/model-serialization/intellij.platform.jps.model.serialization.tests.iml
@@ -15,6 +15,7 @@
     <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
     <orderEntry type="module" module-name="intellij.platform.jps.model.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" scope="TEST" />
diff --git a/platform/execution-impl/BUILD.bazel b/platform/execution-impl/BUILD.bazel
index e67e0f151bf5..802940488a9a 100644
--- a/platform/execution-impl/BUILD.bazel
+++ b/platform/execution-impl/BUILD.bazel
@@ -57,6 +57,7 @@ jvm_library(
     "//platform/workspace/jps",
     "//platform/backend/workspace",
     "//platform/diagnostic",
+    "//platform/project-frame",
     "//platform/ijent",
     "//platform/ijent/impl",
     "//platform/forms_rt:java-guiForms-rt",
@@ -80,6 +81,7 @@ jvm_library(
   visibility = ["//visibility:public"],
   srcs = glob([], allow_empty = True),
   runtime_deps = [
+    "@lib//:kotlin-stdlib",
     "//platform/forms_rt:java-guiForms-rt",
     "//libraries/pty4j",
   ]
@@ -101,6 +103,7 @@ jvm_library(
     "//platform/execution",
     "//platform/util/concurrency",
     "//platform/util/concurrency:concurrency_test_lib",
+    "@lib//:kotlin-stdlib",
     "@lib//:assert_j",
     "//platform/core-ui",
     "//libraries/jediterm-core",
diff --git a/platform/execution-impl/intellij.platform.execution.impl.iml b/platform/execution-impl/intellij.platform.execution.impl.iml
index 002c13012465..7d2ac03ee7b4 100644
--- a/platform/execution-impl/intellij.platform.execution.impl.iml
+++ b/platform/execution-impl/intellij.platform.execution.impl.iml
@@ -77,6 +77,7 @@
     <orderEntry type="module" module-name="intellij.platform.workspace.jps" />
     <orderEntry type="module" module-name="intellij.platform.backend.workspace" />
     <orderEntry type="module" module-name="intellij.platform.diagnostic" />
+    <orderEntry type="module" module-name="intellij.platform.projectFrame" />
     <orderEntry type="module" module-name="intellij.platform.ijent" />
     <orderEntry type="module" module-name="intellij.platform.ijent.community.impl" />
     <orderEntry type="module" module-name="intellij.java.guiForms.rt" />
diff --git a/platform/execution-impl/intellij.platform.execution.tests.iml b/platform/execution-impl/intellij.platform.execution.tests.iml
index f69446e25119..be39bdb77c4c 100644
--- a/platform/execution-impl/intellij.platform.execution.tests.iml
+++ b/platform/execution-impl/intellij.platform.execution.tests.iml
@@ -15,6 +15,7 @@
     <orderEntry type="module" module-name="intellij.platform.execution.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.execution" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.concurrency" scope="TEST" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" scope="TEST" />
     <orderEntry type="module" module-name="intellij.libraries.jediterm.core" scope="TEST" />
diff --git a/platform/external-system-api/dependency-updater/BUILD.bazel b/platform/external-system-api/dependency-updater/BUILD.bazel
index 530705ae9848..cf0287a37b94 100644
--- a/platform/external-system-api/dependency-updater/BUILD.bazel
+++ b/platform/external-system-api/dependency-updater/BUILD.bazel
@@ -36,7 +36,8 @@ resourcegroup(
 jvm_library(
   name = "externalSystem-dependencyUpdater-tests",
   visibility = ["//visibility:public"],
-  srcs = glob([], allow_empty = True)
+  srcs = glob([], allow_empty = True),
+  runtime_deps = ["@lib//:kotlin-stdlib"]
 )
 
 jvm_library(
@@ -49,6 +50,7 @@ jvm_library(
     "//platform/core-api:core",
     "//platform/external-system-api/dependency-updater",
     "//java/openapi:java",
+    "@lib//:kotlin-stdlib",
     "//plugins/groovy/groovy-psi:psi",
     "//plugins/gradle",
     "//platform/external-system-impl:externalSystem-tests_test_lib",
diff --git a/platform/external-system-api/dependency-updater/intellij.platform.externalSystem.dependencyUpdater.tests.iml b/platform/external-system-api/dependency-updater/intellij.platform.externalSystem.dependencyUpdater.tests.iml
index 1c23dbfe249e..35148529cc4d 100644
--- a/platform/external-system-api/dependency-updater/intellij.platform.externalSystem.dependencyUpdater.tests.iml
+++ b/platform/external-system-api/dependency-updater/intellij.platform.externalSystem.dependencyUpdater.tests.iml
@@ -13,6 +13,7 @@
     <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.externalSystem.dependencyUpdater" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java" scope="TEST" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.groovy.psi" scope="TEST" />
     <orderEntry type="module" module-name="intellij.gradle" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.externalSystem.tests" scope="TEST" />
diff --git a/platform/lang-impl/BUILD.bazel b/platform/lang-impl/BUILD.bazel
index fd6c3ddffdbc..8eec1e5c9016 100644
--- a/platform/lang-impl/BUILD.bazel
+++ b/platform/lang-impl/BUILD.bazel
@@ -93,6 +93,7 @@ jvm_library(
     "//platform/util/jdom",
     "//platform/util-class-loader:util-classLoader",
     "//platform/util/zip",
+    "//platform/project-frame",
     "@lib//:opentelemetry",
     "//platform/platform-impl/codeinsight-inline:ide-codeinsight-inline",
     "@lib//:opentelemetry-semconv",
@@ -281,6 +282,7 @@ jvm_library(
     "//platform/core-impl",
     "//platform/execution",
     "//platform/forms_rt:java-guiForms-rt",
+    "//platform/project-frame",
   ],
   exports = [
     "//platform/lang-api:lang",
diff --git a/platform/lang-impl/intellij.platform.lang.impl.iml b/platform/lang-impl/intellij.platform.lang.impl.iml
index 4eea16e227ba..d9b84f2b76d4 100644
--- a/platform/lang-impl/intellij.platform.lang.impl.iml
+++ b/platform/lang-impl/intellij.platform.lang.impl.iml
@@ -101,6 +101,7 @@
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.platform.util.classLoader" />
     <orderEntry type="module" module-name="intellij.platform.util.zip" />
+    <orderEntry type="module" module-name="intellij.platform.projectFrame" />
     <orderEntry type="library" name="opentelemetry" level="project" />
     <orderEntry type="module" module-name="intellij.platform.ide.codeinsight.inline" />
     <orderEntry type="library" name="opentelemetry-semconv" level="project" />
diff --git a/platform/lang-impl/intellij.platform.lang.tests.iml b/platform/lang-impl/intellij.platform.lang.tests.iml
index cd3166b30379..a01aa19a9b4e 100644
--- a/platform/lang-impl/intellij.platform.lang.tests.iml
+++ b/platform/lang-impl/intellij.platform.lang.tests.iml
@@ -103,5 +103,6 @@
     <orderEntry type="module" module-name="intellij.platform.core.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.execution" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.guiForms.rt" />
+    <orderEntry type="module" module-name="intellij.platform.projectFrame" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/lvcs-impl/BUILD.bazel b/platform/lvcs-impl/BUILD.bazel
index 02b04c88296e..695ea91b6870 100644
--- a/platform/lvcs-impl/BUILD.bazel
+++ b/platform/lvcs-impl/BUILD.bazel
@@ -14,6 +14,7 @@ jvm_library(
   srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True),
   resources = [":lvcs-impl_resources"],
   deps = [
+    "@lib//:kotlin-stdlib",
     "//platform/analysis-api:analysis",
     "//platform/code-style-api:codeStyle",
     "//platform/util/concurrency",
@@ -48,6 +49,7 @@ jvm_library(
   srcs = glob(["testSrc/**/*.kt", "testSrc/**/*.java", "testSrc/**/*.form"], allow_empty = True),
   associates = [":lvcs-impl"],
   deps = [
+    "@lib//:kotlin-stdlib",
     "//platform/analysis-api:analysis",
     "//platform/code-style-api:codeStyle",
     "//platform/util/concurrency",
diff --git a/platform/lvcs-impl/intellij.platform.lvcs.impl.iml b/platform/lvcs-impl/intellij.platform.lvcs.impl.iml
index 19891e2701a4..20e4a9f86d7a 100644
--- a/platform/lvcs-impl/intellij.platform.lvcs.impl.iml
+++ b/platform/lvcs-impl/intellij.platform.lvcs.impl.iml
@@ -9,6 +9,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.codeStyle" />
     <orderEntry type="module" module-name="intellij.platform.concurrency" />
diff --git a/platform/navbar/frontend/BUILD.bazel b/platform/navbar/frontend/BUILD.bazel
index ba45af97e8f1..17934331b89d 100644
--- a/platform/navbar/frontend/BUILD.bazel
+++ b/platform/navbar/frontend/BUILD.bazel
@@ -32,6 +32,7 @@ jvm_library(
     "//platform/platform-impl:ide-impl",
     "//platform/lang-impl",
     "//platform/lang-api:lang",
+    "//platform/project-frame",
   ],
   exports = ["//platform/navbar/shared:navbar"]
 )
diff --git a/platform/navbar/frontend/intellij.platform.navbar.frontend.iml b/platform/navbar/frontend/intellij.platform.navbar.frontend.iml
index e4ba62199076..ff2c2426f45d 100644
--- a/platform/navbar/frontend/intellij.platform.navbar.frontend.iml
+++ b/platform/navbar/frontend/intellij.platform.navbar.frontend.iml
@@ -26,5 +26,6 @@
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.platform.projectFrame" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/new-users-onboarding/BUILD.bazel b/platform/new-users-onboarding/BUILD.bazel
index 63855c61813d..25ec36e65eb0 100644
--- a/platform/new-users-onboarding/BUILD.bazel
+++ b/platform/new-users-onboarding/BUILD.bazel
@@ -21,6 +21,7 @@ jvm_library(
     "//platform/new-ui-onboarding",
     "//platform/core-ui",
     "//platform/projectModel-api:projectModel",
+    "@lib//:kotlin-stdlib",
     "//platform/util/coroutines",
     "//platform/statistics",
     "//platform/lang-impl",
diff --git a/platform/new-users-onboarding/intellij.platform.ide.newUsersOnboarding.iml b/platform/new-users-onboarding/intellij.platform.ide.newUsersOnboarding.iml
index d3044517c599..07a7dd71741a 100644
--- a/platform/new-users-onboarding/intellij.platform.ide.newUsersOnboarding.iml
+++ b/platform/new-users-onboarding/intellij.platform.ide.newUsersOnboarding.iml
@@ -15,6 +15,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.newUiOnboarding" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.coroutines" />
     <orderEntry type="module" module-name="intellij.platform.statistics" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
diff --git a/platform/non-modal-welcome-screen/BUILD.bazel b/platform/non-modal-welcome-screen/BUILD.bazel
index f0e85073a2ef..b5dd4f8796c1 100644
--- a/platform/non-modal-welcome-screen/BUILD.bazel
+++ b/platform/non-modal-welcome-screen/BUILD.bazel
@@ -16,6 +16,7 @@ jvm_library(
   deps = [
     "//platform/analysis-api:analysis",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/project-frame",
     "//platform/compose",
     "//platform/core-api:core",
     "//jps/model-api:model",
@@ -45,6 +46,7 @@ jvm_library(
   deps = [
     "//platform/analysis-api:analysis",
     "//platform/editor-ui-api:editor-ui",
+    "//platform/project-frame",
     "//platform/compose",
     "//platform/compose:compose_test_lib",
     "//platform/core-api:core",
diff --git a/platform/non-modal-welcome-screen/intellij.platform.ide.nonModalWelcomeScreen.iml b/platform/non-modal-welcome-screen/intellij.platform.ide.nonModalWelcomeScreen.iml
index 8857c6a6124d..8932e548a2e7 100644
--- a/platform/non-modal-welcome-screen/intellij.platform.ide.nonModalWelcomeScreen.iml
+++ b/platform/non-modal-welcome-screen/intellij.platform.ide.nonModalWelcomeScreen.iml
@@ -36,6 +36,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.projectFrame" />
     <orderEntry type="module" module-name="intellij.platform.compose" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
diff --git a/platform/platform-api/BUILD.bazel b/platform/platform-api/BUILD.bazel
index a7db4cd40fb1..aef22880a003 100644
--- a/platform/platform-api/BUILD.bazel
+++ b/platform/platform-api/BUILD.bazel
@@ -66,7 +66,6 @@ jvm_library(
     "//platform/editor-ui-api:editor-ui",
     "//platform/util:util-ui",
     "//platform/ide-core",
-    "//platform/project-frame",
     "//platform/welcome-screen",
     "//platform/progress/shared:ide-progress",
   ]
diff --git a/platform/platform-api/intellij.platform.ide.iml b/platform/platform-api/intellij.platform.ide.iml
index 08afafedb532..d8eaf7583b6f 100644
--- a/platform/platform-api/intellij.platform.ide.iml
+++ b/platform/platform-api/intellij.platform.ide.iml
@@ -32,7 +32,7 @@
     <orderEntry type="module" module-name="intellij.platform.credentialStore" />
     <orderEntry type="module" module-name="intellij.platform.remote.core" />
     <orderEntry type="module" module-name="intellij.platform.ide.core" exported="" />
-    <orderEntry type="module" module-name="intellij.platform.projectFrame" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.projectFrame" />
     <orderEntry type="module" module-name="intellij.platform.welcomeScreen" exported="" />
     <orderEntry type="module" module-name="intellij.platform.util.text.matching" />
     <orderEntry type="module" module-name="intellij.platform.diagnostic" />
diff --git a/platform/platform-impl/BUILD.bazel b/platform/platform-impl/BUILD.bazel
index 34e2f6078fc1..487dda0d78c0 100644
--- a/platform/platform-impl/BUILD.bazel
+++ b/platform/platform-impl/BUILD.bazel
@@ -149,6 +149,7 @@ jvm_library(
     "//platform/workspace/storage",
     "//platform/pluginSystem/parser/impl",
     "//platform/eel",
+    "//platform/project-frame",
     "//platform/platform-util-io:ide-util-io",
     "//platform/locking-impl",
     "//platform/platform-impl/concurrency",
@@ -162,7 +163,6 @@ jvm_library(
   ],
   exports = [
     "//platform/platform-api:ide",
-    "@lib//:kotlin-stdlib",
     "//platform/util:util-ui",
   ],
   runtime_deps = [
@@ -321,6 +321,7 @@ jvm_library(
     "//platform/pluginSystem/parser/impl",
     "//platform/pluginSystem/parser/impl:impl_test_lib",
     "//platform/eel",
+    "//platform/project-frame",
     "//platform/platform-util-io:ide-util-io",
     "//platform/locking-impl",
     "//platform/platform-impl/concurrency",
@@ -334,7 +335,6 @@ jvm_library(
   ],
   exports = [
     "//platform/platform-api:ide",
-    "@lib//:kotlin-stdlib",
     "//platform/util:util-ui",
   ]
 )
diff --git a/platform/platform-impl/api-dump.txt b/platform/platform-impl/api-dump.txt
index aa8e278caf2a..d71211212a26 100644
--- a/platform/platform-impl/api-dump.txt
+++ b/platform/platform-impl/api-dump.txt
@@ -1207,7 +1207,6 @@ f:com.intellij.toolWindow.ToolWindowDefaultLayoutManager
 - f:deleteLayout(java.lang.String):V
 - f:getActiveLayoutName():java.lang.String
 - f:getFactoryDefaultLayoutCopy():com.intellij.openapi.wm.impl.DesktopLayout
-- sf:getInstance():com.intellij.toolWindow.ToolWindowDefaultLayoutManager
 - f:getLayoutCopy():com.intellij.openapi.wm.impl.DesktopLayout
 - f:getLayoutNames():java.util.Set
 - f:renameLayout(java.lang.String,java.lang.String):V
diff --git a/platform/platform-impl/intellij.platform.ide.impl.iml b/platform/platform-impl/intellij.platform.ide.impl.iml
index 141ec7e724e0..e41ae52e498d 100644
--- a/platform/platform-impl/intellij.platform.ide.impl.iml
+++ b/platform/platform-impl/intellij.platform.ide.impl.iml
@@ -67,7 +67,7 @@
     <orderEntry type="module" module-name="intellij.libraries.imgscalr" />
     <orderEntry type="module" module-name="intellij.platform.builtInServer" />
     <orderEntry type="module" module-name="intellij.platform.ide.observable" />
-    <orderEntry type="library" exported="" name="kotlin-stdlib" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="slf4j-api" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="slf4j-jdk14" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.stream" />
@@ -168,6 +168,7 @@
     <orderEntry type="module" module-name="intellij.platform.pluginSystem.parser.impl" />
     <orderEntry type="module" module-name="intellij.platform.syntax.extensions" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.eel" />
+    <orderEntry type="module" module-name="intellij.platform.projectFrame" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
     <orderEntry type="module" module-name="intellij.platform.locking.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.concurrency" />
diff --git a/platform/platform-impl/internal/BUILD.bazel b/platform/platform-impl/internal/BUILD.bazel
index 2fdad33a55cd..0ea7b78ef2c8 100644
--- a/platform/platform-impl/internal/BUILD.bazel
+++ b/platform/platform-impl/internal/BUILD.bazel
@@ -34,6 +34,7 @@ jvm_library(
     "//platform/editor-ui-ex:editor-ex",
     "//platform/analysis-impl",
     "//platform/util/progress",
+    "//platform/project-frame",
     "//libraries/jcef",
     "//platform/lang-api:lang",
     "//platform/backend/workspace",
diff --git a/platform/platform-impl/internal/intellij.platform.ide.internal.iml b/platform/platform-impl/internal/intellij.platform.ide.internal.iml
index ab398b16bc5a..b58fa88d5ce1 100644
--- a/platform/platform-impl/internal/intellij.platform.ide.internal.iml
+++ b/platform/platform-impl/internal/intellij.platform.ide.internal.iml
@@ -49,6 +49,7 @@
     <orderEntry type="module" module-name="intellij.platform.editor.ex" />
     <orderEntry type="module" module-name="intellij.platform.analysis.impl" />
     <orderEntry type="module" module-name="intellij.platform.util.progress" />
+    <orderEntry type="module" module-name="intellij.platform.projectFrame" />
     <orderEntry type="module" module-name="intellij.libraries.jcef" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.platform.backend.workspace" />
diff --git a/platform/platform-tests/durability/BUILD.bazel b/platform/platform-tests/durability/BUILD.bazel
index 29b527fb798d..6918ce08e9c1 100644
--- a/platform/platform-tests/durability/BUILD.bazel
+++ b/platform/platform-tests/durability/BUILD.bazel
@@ -16,6 +16,7 @@ jvm_library(
   srcs = glob([], allow_empty = True),
   runtime_deps = [
     "//platform/util-ex",
+    "@lib//:kotlin-stdlib",
     "//platform/platform-impl:ide-impl",
     "//platform/util",
     "//platform/util/storages",
@@ -32,6 +33,7 @@ jvm_library(
   deps = [
     "//platform/util-ex",
     "@lib//:ktor-network-tls",
+    "@lib//:kotlin-stdlib",
     "//libraries/io",
     "//platform/platform-impl:ide-impl",
     "//libraries/kotlinx/coroutines/core",
diff --git a/platform/platform-tests/durability/intellij.platform.durability.iml b/platform/platform-tests/durability/intellij.platform.durability.iml
index 7026233068cc..cd4862c8d990 100644
--- a/platform/platform-tests/durability/intellij.platform.durability.iml
+++ b/platform/platform-tests/durability/intellij.platform.durability.iml
@@ -31,6 +31,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.util.ex" />
     <orderEntry type="library" scope="TEST" name="ktor-network-tls" level="project" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.io" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.libraries.kotlinx.coroutines.core" scope="TEST" />
diff --git a/platform/polySymbols/BUILD.bazel b/platform/polySymbols/BUILD.bazel
index bb417534165b..8f01222dec45 100644
--- a/platform/polySymbols/BUILD.bazel
+++ b/platform/polySymbols/BUILD.bazel
@@ -54,6 +54,7 @@ jvm_library(
     "//platform/editor-ui-ex:editor-ex",
     "@lib//:junit4",
     "//platform/core-api:core",
+    "@lib//:kotlin-stdlib",
     "//platform/projectModel-api:projectModel",
     "//platform/usageView",
     "//platform/refactoring",
diff --git a/platform/polySymbols/intellij.platform.polySymbols.testFramework.iml b/platform/polySymbols/intellij.platform.polySymbols.testFramework.iml
index 2ff34e593b1a..3b5833f6361e 100644
--- a/platform/polySymbols/intellij.platform.polySymbols.testFramework.iml
+++ b/platform/polySymbols/intellij.platform.polySymbols.testFramework.iml
@@ -16,6 +16,7 @@
     <orderEntry type="module" module-name="intellij.platform.editor.ex" />
     <orderEntry type="library" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.usageView" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
diff --git a/platform/runtime/product/tests/BUILD.bazel b/platform/runtime/product/tests/BUILD.bazel
index f307f99b5466..5dc5c5e8b24f 100644
--- a/platform/runtime/product/tests/BUILD.bazel
+++ b/platform/runtime/product/tests/BUILD.bazel
@@ -5,7 +5,10 @@ jvm_library(
   name = "tests",
   visibility = ["//visibility:public"],
   srcs = glob([], allow_empty = True),
-  runtime_deps = ["//platform/runtime/product"]
+  runtime_deps = [
+    "//platform/runtime/product",
+    "@lib//:kotlin-stdlib",
+  ]
 )
 
 jvm_library(
@@ -15,6 +18,7 @@ jvm_library(
   srcs = glob(["testSrc/**/*.kt", "testSrc/**/*.java", "testSrc/**/*.form"], allow_empty = True),
   deps = [
     "//platform/runtime/product",
+    "@lib//:kotlin-stdlib",
     "//platform/testFramework",
     "//platform/testFramework:testFramework_test_lib",
     "//platform/runtime/repository",
diff --git a/platform/runtime/product/tests/intellij.platform.runtime.product.tests.iml b/platform/runtime/product/tests/intellij.platform.runtime.product.tests.iml
index ae7113d5040f..deb0e476cfe9 100644
--- a/platform/runtime/product/tests/intellij.platform.runtime.product.tests.iml
+++ b/platform/runtime/product/tests/intellij.platform.runtime.product.tests.iml
@@ -8,6 +8,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.runtime.product" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.runtime.repository" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.runtime.repository.tests" scope="TEST" />
diff --git a/platform/runtime/repository/tests/BUILD.bazel b/platform/runtime/repository/tests/BUILD.bazel
index 4cd823c8d740..8af16a67f9da 100644
--- a/platform/runtime/repository/tests/BUILD.bazel
+++ b/platform/runtime/repository/tests/BUILD.bazel
@@ -5,7 +5,10 @@ jvm_library(
   name = "tests",
   visibility = ["//visibility:public"],
   srcs = glob([], allow_empty = True),
-  runtime_deps = ["//platform/runtime/repository"]
+  runtime_deps = [
+    "@lib//:kotlin-stdlib",
+    "//platform/runtime/repository",
+  ]
 )
 
 jvm_library(
@@ -14,6 +17,7 @@ jvm_library(
   visibility = ["//visibility:public"],
   srcs = glob(["testSrc/**/*.kt", "testSrc/**/*.java", "testSrc/**/*.form"], allow_empty = True),
   deps = [
+    "@lib//:kotlin-stdlib",
     "//platform/runtime/repository",
     "//platform/util-ex",
     "//platform/testFramework",
diff --git a/platform/runtime/repository/tests/intellij.platform.runtime.repository.tests.iml b/platform/runtime/repository/tests/intellij.platform.runtime.repository.tests.iml
index 43d2699d0622..34ac53588a00 100644
--- a/platform/runtime/repository/tests/intellij.platform.runtime.repository.tests.iml
+++ b/platform/runtime/repository/tests/intellij.platform.runtime.repository.tests.iml
@@ -7,6 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.runtime.repository" />
     <orderEntry type="module" module-name="intellij.platform.util.ex" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
diff --git a/platform/smRunner/vcs/BUILD.bazel b/platform/smRunner/vcs/BUILD.bazel
index 6817da0d188e..2df7b3be9753 100644
--- a/platform/smRunner/vcs/BUILD.bazel
+++ b/platform/smRunner/vcs/BUILD.bazel
@@ -20,6 +20,7 @@ jvm_library(
     "//platform/execution-impl",
     "//platform/projectModel-api:projectModel",
     "//platform/smRunner",
+    "@lib//:kotlin-stdlib",
     "//platform/vcs-api:vcs",
     "//platform/platform-impl:ide-impl",
     "//platform/lang-api:lang",
diff --git a/platform/smRunner/vcs/intellij.platform.smRunner.vcs.iml b/platform/smRunner/vcs/intellij.platform.smRunner.vcs.iml
index 54ccafa6cdac..57d029644ca0 100644
--- a/platform/smRunner/vcs/intellij.platform.smRunner.vcs.iml
+++ b/platform/smRunner/vcs/intellij.platform.smRunner.vcs.iml
@@ -14,6 +14,7 @@
     <orderEntry type="module" module-name="intellij.platform.execution.impl" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.smRunner" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.vcs" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
diff --git a/platform/tasks-platform-impl/BUILD.bazel b/platform/tasks-platform-impl/BUILD.bazel
index 59e001502cae..a39e6085aded 100644
--- a/platform/tasks-platform-impl/BUILD.bazel
+++ b/platform/tasks-platform-impl/BUILD.bazel
@@ -23,6 +23,7 @@ jvm_library(
     "//platform/projectModel-impl",
     "//platform/platform-api:ide",
     "//platform/vcs-api:vcs",
+    "@lib//:kotlin-stdlib",
     "//libraries/gson",
     "//platform/platform-impl:ide-impl",
     "//platform/lang-impl",
diff --git a/platform/tasks-platform-impl/intellij.platform.tasks.impl.iml b/platform/tasks-platform-impl/intellij.platform.tasks.impl.iml
index 7ee5359c4579..e79ccc3974c8 100644
--- a/platform/tasks-platform-impl/intellij.platform.tasks.impl.iml
+++ b/platform/tasks-platform-impl/intellij.platform.tasks.impl.iml
@@ -17,6 +17,7 @@
     <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide" />
     <orderEntry type="module" module-name="intellij.platform.vcs" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.gson" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
diff --git a/platform/testFramework/junit5/codeInsight/BUILD.bazel b/platform/testFramework/junit5/codeInsight/BUILD.bazel
index 7c6707a27c65..ec62301c2590 100644
--- a/platform/testFramework/junit5/codeInsight/BUILD.bazel
+++ b/platform/testFramework/junit5/codeInsight/BUILD.bazel
@@ -14,6 +14,7 @@ jvm_library(
   srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True),
   resources = [":codeInsight_resources"],
   deps = [
+    "@lib//:kotlin-stdlib",
     "//platform/testFramework",
     "//platform/testFramework/junit5",
     "//platform/core-api:core",
diff --git a/platform/testFramework/junit5/codeInsight/intellij.platform.testFramework.junit5.codeInsight.iml b/platform/testFramework/junit5/codeInsight/intellij.platform.testFramework.junit5.codeInsight.iml
index 45714b861749..cf1c8724ad69 100644
--- a/platform/testFramework/junit5/codeInsight/intellij.platform.testFramework.junit5.codeInsight.iml
+++ b/platform/testFramework/junit5/codeInsight/intellij.platform.testFramework.junit5.codeInsight.iml
@@ -8,6 +8,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" />
     <orderEntry type="module" module-name="intellij.platform.testFramework.junit5" />
     <orderEntry type="module" module-name="intellij.platform.core" />
diff --git a/platform/testFramework/ui/BUILD.bazel b/platform/testFramework/ui/BUILD.bazel
index 9242ef5933db..ff12affc2bae 100644
--- a/platform/testFramework/ui/BUILD.bazel
+++ b/platform/testFramework/ui/BUILD.bazel
@@ -18,6 +18,7 @@ jvm_library(
     "//platform/platform-impl:ide-impl",
     "@lib//:platform-test_framework-ui-intellij-remoterobot-remote-fixtures",
     "//platform/built-in-server-api:builtInServer",
+    "@lib//:kotlin-stdlib",
     "//platform/built-in-server:builtInServer-impl",
     "//platform/platform-util-netty:ide-util-netty",
     "//platform/platform-util-io-impl:ide-util-io-impl",
diff --git a/platform/testFramework/ui/intellij.platform.testFramework.ui.iml b/platform/testFramework/ui/intellij.platform.testFramework.ui.iml
index bbdfc851d48f..e9996eb34c7a 100644
--- a/platform/testFramework/ui/intellij.platform.testFramework.ui.iml
+++ b/platform/testFramework/ui/intellij.platform.testFramework.ui.iml
@@ -30,6 +30,7 @@
       </library>
     </orderEntry>
     <orderEntry type="module" module-name="intellij.platform.builtInServer" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.builtInServer.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.netty" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io.impl" />
diff --git a/platform/vcs-impl/BUILD.bazel b/platform/vcs-impl/BUILD.bazel
index f957ee41e406..a2da1d08f5e9 100644
--- a/platform/vcs-impl/BUILD.bazel
+++ b/platform/vcs-impl/BUILD.bazel
@@ -74,6 +74,7 @@ jvm_library(
     "//platform/kernel/shared:kernel",
     "//platform/vcs-impl/shared",
     "//libraries/jgoodies/forms",
+    "//platform/project-frame",
     "//platform/observable",
     "//platform/platform-impl/concurrency",
     "//platform/project/shared:project",
@@ -161,6 +162,7 @@ jvm_library(
     "//platform/vcs-impl/shared",
     "//platform/vcs-impl/shared:shared_test_lib",
     "//libraries/jgoodies/forms",
+    "//platform/project-frame",
     "//platform/observable",
     "//platform/platform-impl/concurrency",
     "//platform/project/shared:project",
diff --git a/platform/vcs-impl/intellij.platform.vcs.impl.iml b/platform/vcs-impl/intellij.platform.vcs.impl.iml
index fd52560f161c..7ed76c52c4b8 100644
--- a/platform/vcs-impl/intellij.platform.vcs.impl.iml
+++ b/platform/vcs-impl/intellij.platform.vcs.impl.iml
@@ -98,6 +98,7 @@
     <orderEntry type="module" module-name="intellij.platform.kernel" />
     <orderEntry type="module" module-name="intellij.platform.vcs.impl.shared" />
     <orderEntry type="module" module-name="intellij.libraries.jgoodies.forms" />
+    <orderEntry type="module" module-name="intellij.platform.projectFrame" />
     <orderEntry type="module" module-name="intellij.platform.ide.observable" />
     <orderEntry type="module" module-name="intellij.platform.ide.concurrency" />
     <orderEntry type="module" module-name="intellij.platform.project" />
diff --git a/platform/warmup/performanceTesting/BUILD.bazel b/platform/warmup/performanceTesting/BUILD.bazel
index ac661ba7687a..b56ebacdef80 100644
--- a/platform/warmup/performanceTesting/BUILD.bazel
+++ b/platform/warmup/performanceTesting/BUILD.bazel
@@ -17,6 +17,7 @@ jvm_library(
     "//platform/projectModel-api:projectModel",
     "//platform/warmup",
     "//plugins/performanceTesting/core:performanceTesting",
+    "@lib//:kotlin-stdlib",
     "//platform/platform-impl:ide-impl",
     "//platform/core-api:core",
     "//platform/remote-driver/model",
diff --git a/platform/warmup/performanceTesting/intellij.platform.warmup.performanceTesting.iml b/platform/warmup/performanceTesting/intellij.platform.warmup.performanceTesting.iml
index b396b93e2b36..41c716cd3336 100644
--- a/platform/warmup/performanceTesting/intellij.platform.warmup.performanceTesting.iml
+++ b/platform/warmup/performanceTesting/intellij.platform.warmup.performanceTesting.iml
@@ -11,6 +11,7 @@
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.warmup" />
     <orderEntry type="module" module-name="intellij.performanceTesting" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.driver.model" />
diff --git a/platform/workspace/storage/testEntities/BUILD.bazel b/platform/workspace/storage/testEntities/BUILD.bazel
index 5733e9c99329..8d89b3d9f745 100644
--- a/platform/workspace/storage/testEntities/BUILD.bazel
+++ b/platform/workspace/storage/testEntities/BUILD.bazel
@@ -5,7 +5,10 @@ jvm_library(
   name = "testEntities",
   visibility = ["//visibility:public"],
   srcs = glob([], allow_empty = True),
-  runtime_deps = ["//libraries/kotlin/reflect"]
+  runtime_deps = [
+    "@lib//:kotlin-stdlib",
+    "//libraries/kotlin/reflect",
+  ]
 )
 
 jvm_library(
@@ -14,6 +17,7 @@ jvm_library(
   visibility = ["//visibility:public"],
   srcs = glob(["testSrc/**/*.kt", "testSrc/**/*.java", "testSrc/**/*.form", "testGen/**/*.kt", "testGen/**/*.java"], allow_empty = True),
   deps = [
+    "@lib//:kotlin-stdlib",
     "//platform/workspace/storage",
     "//platform/testFramework",
     "//platform/testFramework:testFramework_test_lib",
diff --git a/platform/workspace/storage/testEntities/intellij.platform.workspace.storage.testEntities.iml b/platform/workspace/storage/testEntities/intellij.platform.workspace.storage.testEntities.iml
index 27800c838bf7..e01bd9d3e610 100644
--- a/platform/workspace/storage/testEntities/intellij.platform.workspace.storage.testEntities.iml
+++ b/platform/workspace/storage/testEntities/intellij.platform.workspace.storage.testEntities.iml
@@ -8,6 +8,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.workspace.storage" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.libraries.kotlin.reflect" />
diff --git a/platform/workspace/storage/tests/BUILD.bazel b/platform/workspace/storage/tests/BUILD.bazel
index 95b286581037..89c7e80bc8b4 100644
--- a/platform/workspace/storage/tests/BUILD.bazel
+++ b/platform/workspace/storage/tests/BUILD.bazel
@@ -22,6 +22,7 @@ jvm_library(
   visibility = ["//visibility:public"],
   srcs = glob([], allow_empty = True),
   runtime_deps = [
+    "@lib//:kotlin-stdlib",
     "//platform/analysis-api:analysis",
     "@lib//:kotlin-test",
     "//libraries/kryo5",
@@ -44,6 +45,7 @@ jvm_library(
     "//libraries/guava",
     "//libraries/kotlin/reflect",
     "//libraries/fastutil",
+    "@lib//:kotlin-stdlib",
     "//platform/analysis-api:analysis",
     "@lib//:kotlin-test",
     "//libraries/kryo5",
diff --git a/platform/workspace/storage/tests/intellij.platform.workspace.storage.tests.iml b/platform/workspace/storage/tests/intellij.platform.workspace.storage.tests.iml
index 803675d90ee8..8cd76b7f4ac9 100644
--- a/platform/workspace/storage/tests/intellij.platform.workspace.storage.tests.iml
+++ b/platform/workspace/storage/tests/intellij.platform.workspace.storage.tests.iml
@@ -31,6 +31,7 @@
     <orderEntry type="module" module-name="intellij.libraries.guava" scope="TEST" />
     <orderEntry type="module" module-name="intellij.libraries.kotlin.reflect" scope="TEST" />
     <orderEntry type="module" module-name="intellij.libraries.fastutil" scope="TEST" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="library" name="kotlin-test" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.kryo5" />
diff --git a/platform/xdebugger-testFramework/BUILD.bazel b/platform/xdebugger-testFramework/BUILD.bazel
index 959244f7edcc..4f208f2bae6d 100644
--- a/platform/xdebugger-testFramework/BUILD.bazel
+++ b/platform/xdebugger-testFramework/BUILD.bazel
@@ -7,6 +7,7 @@ jvm_library(
   visibility = ["//visibility:public"],
   srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True),
   deps = [
+    "@lib//:kotlin-stdlib",
     "//platform/util/concurrency",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
diff --git a/platform/xdebugger-testFramework/intellij.platform.debugger.testFramework.iml b/platform/xdebugger-testFramework/intellij.platform.debugger.testFramework.iml
index 5a946cb14c9c..3ef835da294d 100644
--- a/platform/xdebugger-testFramework/intellij.platform.debugger.testFramework.iml
+++ b/platform/xdebugger-testFramework/intellij.platform.debugger.testFramework.iml
@@ -7,6 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <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" />
diff --git a/plugins/agent-workbench/sessions/BUILD.bazel b/plugins/agent-workbench/sessions/BUILD.bazel
index 77460b49dabb..92742be00a87 100644
--- a/plugins/agent-workbench/sessions/BUILD.bazel
+++ b/plugins/agent-workbench/sessions/BUILD.bazel
@@ -29,6 +29,7 @@ jvm_library(
     "//plugins/agent-workbench/codex/common",
     "//plugins/agent-workbench/chat",
     "//libraries/jackson/jackson",
+    "//platform/project-frame",
   ],
   plugins = ["@lib//:compose-plugin"]
 )
@@ -66,6 +67,7 @@ jvm_library(
     "//platform/testFramework/junit5",
     "//platform/testFramework/junit5:junit5_test_lib",
     "//libraries/assertj-core",
+    "//platform/project-frame",
   ],
   plugins = ["@lib//:compose-plugin"]
 )
diff --git a/plugins/agent-workbench/sessions/intellij.agent.workbench.sessions.iml b/plugins/agent-workbench/sessions/intellij.agent.workbench.sessions.iml
index 8b6daa3cb764..d242744eeb5f 100644
--- a/plugins/agent-workbench/sessions/intellij.agent.workbench.sessions.iml
+++ b/plugins/agent-workbench/sessions/intellij.agent.workbench.sessions.iml
@@ -56,5 +56,6 @@
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework.junit5" scope="TEST" />
     <orderEntry type="module" module-name="intellij.libraries.assertj.core" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.projectFrame" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/compilation-charts/BUILD.bazel b/plugins/compilation-charts/BUILD.bazel
index d6c8be3b7fcb..ad61ac9411d6 100644
--- a/plugins/compilation-charts/BUILD.bazel
+++ b/plugins/compilation-charts/BUILD.bazel
@@ -25,6 +25,7 @@ jvm_library(
     "//jps/model-api:model",
     "//platform/lang-api:lang",
     "//platform/lang-core",
+    "@lib//:kotlin-stdlib",
     "//platform/lang-impl",
     "//libraries/jackson/jackson",
     "//libraries/jackson/databind",
diff --git a/plugins/compilation-charts/intellij.compilation.charts.iml b/plugins/compilation-charts/intellij.compilation.charts.iml
index 2295ec1d2dc1..edebd4be9e82 100644
--- a/plugins/compilation-charts/intellij.compilation.charts.iml
+++ b/plugins/compilation-charts/intellij.compilation.charts.iml
@@ -19,6 +19,7 @@
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.platform.lang.core" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.libraries.jackson" />
     <orderEntry type="module" module-name="intellij.libraries.jackson.databind" />
diff --git a/plugins/emojipicker/BUILD.bazel b/plugins/emojipicker/BUILD.bazel
index 288946a56e4a..70ff286c8dcd 100644
--- a/plugins/emojipicker/BUILD.bazel
+++ b/plugins/emojipicker/BUILD.bazel
@@ -14,6 +14,7 @@ jvm_library(
   srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form", "gen/**/*.kt", "gen/**/*.java"], allow_empty = True),
   resources = [":emojipicker_resources"],
   deps = [
+    "@lib//:kotlin-stdlib",
     "//platform/code-style-api:codeStyle",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
diff --git a/plugins/emojipicker/intellij.emojipicker.iml b/plugins/emojipicker/intellij.emojipicker.iml
index 33bde95899ae..2a1c610f6dee 100644
--- a/plugins/emojipicker/intellij.emojipicker.iml
+++ b/plugins/emojipicker/intellij.emojipicker.iml
@@ -9,6 +9,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.codeStyle" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
diff --git a/plugins/github/ultimate-promo/BUILD.bazel b/plugins/github/ultimate-promo/BUILD.bazel
index 134e7d4e1c04..774b3316da6f 100644
--- a/plugins/github/ultimate-promo/BUILD.bazel
+++ b/plugins/github/ultimate-promo/BUILD.bazel
@@ -14,6 +14,7 @@ jvm_library(
   srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True),
   resources = [":ultimate-promo_resources"],
   deps = [
+    "@lib//:kotlin-stdlib",
     "//platform/platform-impl:ide-impl",
     "//plugins/github/github-core:vcs-github",
     "//platform/analysis-api:analysis",
diff --git a/plugins/github/ultimate-promo/intellij.vcs.github.ultimatePromo.iml b/plugins/github/ultimate-promo/intellij.vcs.github.ultimatePromo.iml
index dcd4f4c4c5d2..cbc1198d0aa9 100644
--- a/plugins/github/ultimate-promo/intellij.vcs.github.ultimatePromo.iml
+++ b/plugins/github/ultimate-promo/intellij.vcs.github.ultimatePromo.iml
@@ -8,6 +8,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.vcs.github" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
diff --git a/plugins/ide-features-trainer/BUILD.bazel b/plugins/ide-features-trainer/BUILD.bazel
index b797c53fe1c4..c4adbcabed11 100644
--- a/plugins/ide-features-trainer/BUILD.bazel
+++ b/plugins/ide-features-trainer/BUILD.bazel
@@ -28,6 +28,7 @@ jvm_library(
     "//platform/util-ex",
     "//platform/code-style-api:codeStyle",
     "//platform/util/concurrency",
+    "//platform/project-frame",
     "//platform/core-api:core",
     "//platform/lang-api:lang",
     "//platform/editor-ui-api:editor-ui",
@@ -83,6 +84,7 @@ jvm_library(
     "//platform/code-style-api:codeStyle",
     "//platform/util/concurrency",
     "//platform/util/concurrency:concurrency_test_lib",
+    "//platform/project-frame",
     "//platform/core-api:core",
     "//platform/lang-api:lang",
     "//platform/editor-ui-api:editor-ui",
diff --git a/plugins/ide-features-trainer/intellij.featuresTrainer.iml b/plugins/ide-features-trainer/intellij.featuresTrainer.iml
index 9928fede1730..1bf038f0c025 100644
--- a/plugins/ide-features-trainer/intellij.featuresTrainer.iml
+++ b/plugins/ide-features-trainer/intellij.featuresTrainer.iml
@@ -40,6 +40,7 @@
     <orderEntry type="module" module-name="intellij.platform.util.ex" />
     <orderEntry type="module" module-name="intellij.platform.codeStyle" />
     <orderEntry type="module" module-name="intellij.platform.concurrency" />
+    <orderEntry type="module" module-name="intellij.platform.projectFrame" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
diff --git a/plugins/ide-features-trainer/onboarding/BUILD.bazel b/plugins/ide-features-trainer/onboarding/BUILD.bazel
index 4cd24af13777..1f2367947a65 100644
--- a/plugins/ide-features-trainer/onboarding/BUILD.bazel
+++ b/plugins/ide-features-trainer/onboarding/BUILD.bazel
@@ -14,6 +14,7 @@ jvm_library(
   srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True),
   resources = [":onboarding_resources"],
   deps = [
+    "@lib//:kotlin-stdlib",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
     "//platform/platform-impl:ide-impl",
diff --git a/plugins/ide-features-trainer/onboarding/intellij.featuresTrainer.onboarding.iml b/plugins/ide-features-trainer/onboarding/intellij.featuresTrainer.onboarding.iml
index fbafbff30487..bdce1409f6ba 100644
--- a/plugins/ide-features-trainer/onboarding/intellij.featuresTrainer.onboarding.iml
+++ b/plugins/ide-features-trainer/onboarding/intellij.featuresTrainer.onboarding.iml
@@ -8,6 +8,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" 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.ide.impl" />
diff --git a/plugins/kotlin/onboarding-promoter/BUILD.bazel b/plugins/kotlin/onboarding-promoter/BUILD.bazel
index e4eed2ddf0f0..b2fcd49c560b 100644
--- a/plugins/kotlin/onboarding-promoter/BUILD.bazel
+++ b/plugins/kotlin/onboarding-promoter/BUILD.bazel
@@ -14,6 +14,7 @@ jvm_library(
   srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True),
   resources = [":onboarding-promoter_resources"],
   deps = [
+    "@lib//:kotlin-stdlib",
     "//platform/core-api:core",
     "//platform/core-ui",
     "//platform/platform-impl:ide-impl",
diff --git a/plugins/kotlin/onboarding-promoter/intellij.kotlin.onboarding.promoter.iml b/plugins/kotlin/onboarding-promoter/intellij.kotlin.onboarding.promoter.iml
index 08db375cbea7..5ba0a34ec58a 100644
--- a/plugins/kotlin/onboarding-promoter/intellij.kotlin.onboarding.promoter.iml
+++ b/plugins/kotlin/onboarding-promoter/intellij.kotlin.onboarding.promoter.iml
@@ -8,6 +8,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
diff --git a/plugins/laf/macos/BUILD.bazel b/plugins/laf/macos/BUILD.bazel
index c1ab4b0132b5..ff541f47e5ba 100644
--- a/plugins/laf/macos/BUILD.bazel
+++ b/plugins/laf/macos/BUILD.bazel
@@ -14,6 +14,7 @@ jvm_library(
   srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True),
   resources = [":macos_resources"],
   deps = [
+    "@lib//:kotlin-stdlib",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
     "//platform/util:util-ui",
diff --git a/plugins/laf/macos/intellij.laf.macos.iml b/plugins/laf/macos/intellij.laf.macos.iml
index 3ba63e210cc6..989d04327a3d 100644
--- a/plugins/laf/macos/intellij.laf.macos.iml
+++ b/plugins/laf/macos/intellij.laf.macos.iml
@@ -8,6 +8,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" 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.util.ui" />
diff --git a/plugins/laf/win10/BUILD.bazel b/plugins/laf/win10/BUILD.bazel
index d1d5a4258f0a..e8d1099b1773 100644
--- a/plugins/laf/win10/BUILD.bazel
+++ b/plugins/laf/win10/BUILD.bazel
@@ -14,6 +14,7 @@ jvm_library(
   srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True),
   resources = [":win10_resources"],
   deps = [
+    "@lib//:kotlin-stdlib",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
     "//platform/platform-impl:ide-impl",
diff --git a/plugins/laf/win10/intellij.laf.win10.iml b/plugins/laf/win10/intellij.laf.win10.iml
index 6de05a493f35..3a053802bac1 100644
--- a/plugins/laf/win10/intellij.laf.win10.iml
+++ b/plugins/laf/win10/intellij.laf.win10.iml
@@ -8,6 +8,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" 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.ide.impl" />
diff --git a/plugins/maven-server-api/test/BUILD.bazel b/plugins/maven-server-api/test/BUILD.bazel
index 227de0818045..dffe732806f1 100644
--- a/plugins/maven-server-api/test/BUILD.bazel
+++ b/plugins/maven-server-api/test/BUILD.bazel
@@ -4,7 +4,8 @@ load("@rules_jvm//:jvm.bzl", "jvm_library")
 jvm_library(
   name = "maven-server-tests",
   visibility = ["//visibility:public"],
-  srcs = glob([], allow_empty = True)
+  srcs = glob([], allow_empty = True),
+  runtime_deps = ["@lib//:kotlin-stdlib"]
 )
 
 jvm_library(
@@ -14,6 +15,7 @@ jvm_library(
   srcs = glob(["java/**/*.kt", "java/**/*.java", "java/**/*.form"], allow_empty = True),
   deps = [
     "//plugins/maven-server-api:maven-server",
+    "@lib//:kotlin-stdlib",
     "//platform/testFramework",
     "//platform/testFramework:testFramework_test_lib",
     "@lib//:assert_j",
diff --git a/plugins/maven-server-api/test/intellij.maven.server.tests.iml b/plugins/maven-server-api/test/intellij.maven.server.tests.iml
index 2eaeceae411c..a60926ed89ed 100644
--- a/plugins/maven-server-api/test/intellij.maven.server.tests.iml
+++ b/plugins/maven-server-api/test/intellij.maven.server.tests.iml
@@ -8,6 +8,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.maven.server" scope="TEST" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
   </component>
diff --git a/plugins/settings-sync/settingsSync.performanceTesting/BUILD.bazel b/plugins/settings-sync/settingsSync.performanceTesting/BUILD.bazel
index 6909bed96039..5ed93a2d54d0 100644
--- a/plugins/settings-sync/settingsSync.performanceTesting/BUILD.bazel
+++ b/plugins/settings-sync/settingsSync.performanceTesting/BUILD.bazel
@@ -17,6 +17,7 @@ jvm_library(
     "//plugins/performanceTesting/core:performanceTesting",
     "//platform/platform-impl:ide-impl",
     "//platform/settings-sync-core:settingsSync-core",
+    "@lib//:kotlin-stdlib",
     "//platform/core-api:core",
     "//platform/projectModel-api:projectModel",
   ]
diff --git a/plugins/settings-sync/settingsSync.performanceTesting/intellij.settingsSync.performanceTesting.iml b/plugins/settings-sync/settingsSync.performanceTesting/intellij.settingsSync.performanceTesting.iml
index 8fcd54b26e6c..c9eea6b5129f 100644
--- a/plugins/settings-sync/settingsSync.performanceTesting/intellij.settingsSync.performanceTesting.iml
+++ b/plugins/settings-sync/settingsSync.performanceTesting/intellij.settingsSync.performanceTesting.iml
@@ -11,6 +11,7 @@
     <orderEntry type="module" module-name="intellij.performanceTesting" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.settingsSync.core" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
   </component>
diff --git a/plugins/terminal/sh/BUILD.bazel b/plugins/terminal/sh/BUILD.bazel
index 9465d2e78ad6..ee585cccbb96 100644
--- a/plugins/terminal/sh/BUILD.bazel
+++ b/plugins/terminal/sh/BUILD.bazel
@@ -15,6 +15,7 @@ jvm_library(
   resources = [":sh_resources"],
   deps = [
     "//platform/core-api:core",
+    "@lib//:kotlin-stdlib",
     "//platform/editor-ui-api:editor-ui",
     "//platform/platform-impl:ide-impl",
     "//plugins/terminal",
diff --git a/plugins/terminal/sh/intellij.terminal.sh.iml b/plugins/terminal/sh/intellij.terminal.sh.iml
index 51c5b73d0389..ce3c83be3833 100644
--- a/plugins/terminal/sh/intellij.terminal.sh.iml
+++ b/plugins/terminal/sh/intellij.terminal.sh.iml
@@ -30,6 +30,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.terminal" />
diff --git a/plugins/webp/BUILD.bazel b/plugins/webp/BUILD.bazel
index fa4bd7003c3a..847ea783fba9 100644
--- a/plugins/webp/BUILD.bazel
+++ b/plugins/webp/BUILD.bazel
@@ -14,6 +14,7 @@ jvm_library(
   srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True),
   resources = [":webp_resources"],
   deps = [
+    "@lib//:kotlin-stdlib",
     "//platform/core-api:core",
     "//platform/lang-api:lang",
     "//platform/platform-impl:ide-impl",
diff --git a/plugins/webp/intellij.webp.iml b/plugins/webp/intellij.webp.iml
index 9e0b61c0cfb5..9ceecfc2b663 100644
--- a/plugins/webp/intellij.webp.iml
+++ b/plugins/webp/intellij.webp.iml
@@ -8,6 +8,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
diff --git a/python/BUILD.bazel b/python/BUILD.bazel
index f863a0a6e559..c10be6a5f7a3 100644
--- a/python/BUILD.bazel
+++ b/python/BUILD.bazel
@@ -23,6 +23,7 @@ jvm_library(
     ":pycharm-community_resources_1",
   ],
   deps = [
+    "@lib//:kotlin-stdlib",
     "//platform/platform-impl:ide-impl",
     "//platform/lang-api:lang",
     "//platform/lang-impl",
diff --git a/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/BUILD.bazel b/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/BUILD.bazel
index a69b11866949..59a738b4c773 100644
--- a/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/BUILD.bazel
+++ b/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/BUILD.bazel
@@ -14,6 +14,7 @@ jvm_library(
   srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True),
   resources = [":pycharm-community-ide-impl-promotion_resources"],
   deps = [
+    "@lib//:kotlin-stdlib",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
     "//platform/projectModel-api:projectModel",
diff --git a/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/intellij.pycharm.community.ide.impl.promotion.iml b/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/intellij.pycharm.community.ide.impl.promotion.iml
index ee64d4dcecfb..e04278e9b524 100644
--- a/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/intellij.pycharm.community.ide.impl.promotion.iml
+++ b/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/intellij.pycharm.community.ide.impl.promotion.iml
@@ -8,6 +8,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" 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.projectModel" />
diff --git a/python/intellij.pycharm.community.iml b/python/intellij.pycharm.community.iml
index a120a3c4903e..c45701902033 100644
--- a/python/intellij.pycharm.community.iml
+++ b/python/intellij.pycharm.community.iml
@@ -11,6 +11,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
diff --git a/python/pluginCore/impl/BUILD.bazel b/python/pluginCore/impl/BUILD.bazel
index 28095de23238..0c40e0b28eb3 100644
--- a/python/pluginCore/impl/BUILD.bazel
+++ b/python/pluginCore/impl/BUILD.bazel
@@ -14,6 +14,7 @@ jvm_library(
   srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True),
   resources = [":impl_resources"],
   deps = [
+    "@lib//:kotlin-stdlib",
     "//platform/analysis-api:analysis",
     "//platform/core-api:core",
     "//platform/editor-ui-api:editor-ui",
diff --git a/python/pluginCore/impl/intellij.python.community.plugin.impl.iml b/python/pluginCore/impl/intellij.python.community.plugin.impl.iml
index 1e2a45b325c7..d48dcef9b3cb 100644
--- a/python/pluginCore/impl/intellij.python.community.plugin.impl.iml
+++ b/python/pluginCore/impl/intellij.python.community.plugin.impl.iml
@@ -8,6 +8,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <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" />
diff --git a/python/pluginJava/BUILD.bazel b/python/pluginJava/BUILD.bazel
index 5a2f8650e502..06e580a820d6 100644
--- a/python/pluginJava/BUILD.bazel
+++ b/python/pluginJava/BUILD.bazel
@@ -16,6 +16,7 @@ jvm_library(
   deps = [
     "//platform/analysis-api:analysis",
     "//platform/core-api:core",
+    "@lib//:kotlin-stdlib",
     "//platform/indexing-api:indexing",
     "//jps/model-api:model",
     "//platform/lang-api:lang",
diff --git a/python/pluginJava/intellij.python.community.plugin.java.iml b/python/pluginJava/intellij.python.community.plugin.java.iml
index 33bda24578f3..e9d689806d35 100644
--- a/python/pluginJava/intellij.python.community.plugin.java.iml
+++ b/python/pluginJava/intellij.python.community.plugin.java.iml
@@ -10,6 +10,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <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" />