diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 78dea84c7d58..22c302524257 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -8,7 +8,7 @@
     <option name="languageVersion" value="2.0" />
   </component>
   <component name="KotlinCompilerSettings">
-    <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi -opt-in=org.jetbrains.kotlin.analysis.api.KaNonPublicApi -Xlambdas=class" />
+    <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi -opt-in=org.jetbrains.kotlin.analysis.api.KaNonPublicApi" />
   </component>
   <component name="KotlinJpsPluginSettings">
     <option name="version" value="2.0.0" />
diff --git a/build/tasks/intellij.idea.community.build.tasks.iml b/build/tasks/intellij.idea.community.build.tasks.iml
index cfd078390f68..05cb2c1129c9 100644
--- a/build/tasks/intellij.idea.community.build.tasks.iml
+++ b/build/tasks/intellij.idea.community.build.tasks.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/fleet/kernel/fleet.kernel.iml b/fleet/kernel/fleet.kernel.iml
index 70fb8fc12f21..e235784dac7c 100644
--- a/fleet/kernel/fleet.kernel.iml
+++ b/fleet/kernel/fleet.kernel.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi -opt-in=kotlin.ExperimentalStdlibApi -Xlambdas=class" />
+          <option name="additionalArguments" value="-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi -opt-in=kotlin.ExperimentalStdlibApi" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/fleet/rhizomedb/fleet.rhizomedb.iml b/fleet/rhizomedb/fleet.rhizomedb.iml
index 6c4ae33ca223..70fd3ad313dd 100644
--- a/fleet/rhizomedb/fleet.rhizomedb.iml
+++ b/fleet/rhizomedb/fleet.rhizomedb.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-opt-in=kotlin.ExperimentalStdlibApi -Xallow-kotlin-package -Xlambdas=class" />
+          <option name="additionalArguments" value="-opt-in=kotlin.ExperimentalStdlibApi -Xallow-kotlin-package" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/fleet/rpc/fleet.rpc.iml b/fleet/rpc/fleet.rpc.iml
index 7f99508f3c48..b55db80668ec 100644
--- a/fleet/rpc/fleet.rpc.iml
+++ b/fleet/rpc/fleet.rpc.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi -opt-in=kotlin.ExperimentalStdlibApi -Xlambdas=class" />
+          <option name="additionalArguments" value="-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi -opt-in=kotlin.ExperimentalStdlibApi" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/fleet/util/core/fleet.util.core.iml b/fleet/util/core/fleet.util.core.iml
index 2161da397154..fa1f7561ad31 100644
--- a/fleet/util/core/fleet.util.core.iml
+++ b/fleet/util/core/fleet.util.core.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/fleet/util/os/fleet.util.os.iml b/fleet/util/os/fleet.util.os.iml
index c281815b42e8..6c90dea10be7 100644
--- a/fleet/util/os/fleet.util.os.iml
+++ b/fleet/util/os/fleet.util.os.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xallow-kotlin-package -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xallow-kotlin-package" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/images/intellij.platform.images.iml b/images/intellij.platform.images.iml
index 0a253e63db9d..345b5be762d6 100644
--- a/images/intellij.platform.images.iml
+++ b/images/intellij.platform.images.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/java/compiler/charts/intellij.java.compiler.charts.iml b/java/compiler/charts/intellij.java.compiler.charts.iml
index 5e652480a3f3..072ac044442e 100644
--- a/java/compiler/charts/intellij.java.compiler.charts.iml
+++ b/java/compiler/charts/intellij.java.compiler.charts.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/java/debugger/impl/intellij.java.debugger.impl.iml b/java/debugger/impl/intellij.java.debugger.impl.iml
index 8feed293a575..d5c0275f1c3f 100644
--- a/java/debugger/impl/intellij.java.debugger.impl.iml
+++ b/java/debugger/impl/intellij.java.debugger.impl.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/java/java-frontback-impl/intellij.java.frontback.impl.iml b/java/java-frontback-impl/intellij.java.frontback.impl.iml
index a2a576a0c5bc..56fc9ec3707e 100644
--- a/java/java-frontback-impl/intellij.java.frontback.impl.iml
+++ b/java/java-frontback-impl/intellij.java.frontback.impl.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/platform/backend/workspace/intellij.platform.backend.workspace.iml b/platform/backend/workspace/intellij.platform.backend.workspace.iml
index dcadc5af5a25..68f67e994f21 100644
--- a/platform/backend/workspace/intellij.platform.backend.workspace.iml
+++ b/platform/backend/workspace/intellij.platform.backend.workspace.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xexplicit-api=strict -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xexplicit-api=strict" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/platform/build-scripts/dev-server/intellij.platform.buildScripts.devBuildServer.iml b/platform/build-scripts/dev-server/intellij.platform.buildScripts.devBuildServer.iml
index 736922c84079..a9baa31cf187 100644
--- a/platform/build-scripts/dev-server/intellij.platform.buildScripts.devBuildServer.iml
+++ b/platform/build-scripts/dev-server/intellij.platform.buildScripts.devBuildServer.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/platform/build-scripts/intellij.platform.buildScripts.iml b/platform/build-scripts/intellij.platform.buildScripts.iml
index 8d50e8a7b4f0..78ad0f7eb5d9 100644
--- a/platform/build-scripts/intellij.platform.buildScripts.iml
+++ b/platform/build-scripts/intellij.platform.buildScripts.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=kotlin.RequiresOptIn -opt-in=kotlinx.serialization.ExperimentalSerializationApi -opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=kotlin.RequiresOptIn -opt-in=kotlinx.serialization.ExperimentalSerializationApi -opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/platform/compose/intellij.platform.compose.iml b/platform/compose/intellij.platform.compose.iml
index f328e3a89649..fd96a2685dbd 100644
--- a/platform/compose/intellij.platform.compose.iml
+++ b/platform/compose/intellij.platform.compose.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml b/platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml
index 7c2f9a05e0c4..a0a2da521e70 100644
--- a/platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml
+++ b/platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/platform/diagnostic/startUpPerformanceReporter/intellij.platform.diagnostic.startUpPerformanceReporter.iml b/platform/diagnostic/startUpPerformanceReporter/intellij.platform.diagnostic.startUpPerformanceReporter.iml
index e27606106bf4..66b5f8ad8d70 100644
--- a/platform/diagnostic/startUpPerformanceReporter/intellij.platform.diagnostic.startUpPerformanceReporter.iml
+++ b/platform/diagnostic/startUpPerformanceReporter/intellij.platform.diagnostic.startUpPerformanceReporter.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=kotlinx.serialization.ExperimentalSerializationApi -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=kotlinx.serialization.ExperimentalSerializationApi" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/platform/experiment/intellij.platform.experiment.iml b/platform/experiment/intellij.platform.experiment.iml
index 4d4f59d9ffdb..a03020c1cc90 100644
--- a/platform/experiment/intellij.platform.experiment.iml
+++ b/platform/experiment/intellij.platform.experiment.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/platform/external-system-impl/intellij.platform.externalSystem.impl.iml b/platform/external-system-impl/intellij.platform.externalSystem.impl.iml
index be09eaa792c0..7282fd4d5d1e 100644
--- a/platform/external-system-impl/intellij.platform.externalSystem.impl.iml
+++ b/platform/external-system-impl/intellij.platform.externalSystem.impl.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/platform/feedback/intellij.platform.feedback.iml b/platform/feedback/intellij.platform.feedback.iml
index 85ac905053e2..94f2428b9f56 100644
--- a/platform/feedback/intellij.platform.feedback.iml
+++ b/platform/feedback/intellij.platform.feedback.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/platform/ide-core/intellij.platform.ide.core.iml b/platform/ide-core/intellij.platform.ide.core.iml
index 92952050d2ee..9da967d1ba1d 100644
--- a/platform/ide-core/intellij.platform.ide.core.iml
+++ b/platform/ide-core/intellij.platform.ide.core.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/platform/inspect/intellij.platform.inspect.iml b/platform/inspect/intellij.platform.inspect.iml
index 07337c1a2e99..5cab413bd890 100644
--- a/platform/inspect/intellij.platform.inspect.iml
+++ b/platform/inspect/intellij.platform.inspect.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/platform/kernel/backend/intellij.platform.kernel.backend.iml b/platform/kernel/backend/intellij.platform.kernel.backend.iml
index a6fb701a14c2..640bedd2e2f7 100644
--- a/platform/kernel/backend/intellij.platform.kernel.backend.iml
+++ b/platform/kernel/backend/intellij.platform.kernel.backend.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi -opt-in=kotlin.ExperimentalStdlibApi -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi -opt-in=kotlin.ExperimentalStdlibApi" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/platform/kernel/shared/intellij.platform.kernel.iml b/platform/kernel/shared/intellij.platform.kernel.iml
index fa1ee21d5a22..e6df120bf591 100644
--- a/platform/kernel/shared/intellij.platform.kernel.iml
+++ b/platform/kernel/shared/intellij.platform.kernel.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/platform/lang-impl/intellij.platform.lang.impl.iml b/platform/lang-impl/intellij.platform.lang.impl.iml
index 4deb7fcee6b4..410b2dbaf4d4 100644
--- a/platform/lang-impl/intellij.platform.lang.impl.iml
+++ b/platform/lang-impl/intellij.platform.lang.impl.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/platform/ml-impl/intellij.platform.ml.impl.iml b/platform/ml-impl/intellij.platform.ml.impl.iml
index 60bc1c2a76be..1c2cdee72e1c 100644
--- a/platform/ml-impl/intellij.platform.ml.impl.iml
+++ b/platform/ml-impl/intellij.platform.ml.impl.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/platform/new-ui-onboarding/intellij.platform.ide.newUiOnboarding.iml b/platform/new-ui-onboarding/intellij.platform.ide.newUiOnboarding.iml
index ff67106909b2..340a016d4fb2 100644
--- a/platform/new-ui-onboarding/intellij.platform.ide.newUiOnboarding.iml
+++ b/platform/new-ui-onboarding/intellij.platform.ide.newUiOnboarding.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/platform/platform-impl/intellij.platform.ide.impl.iml b/platform/platform-impl/intellij.platform.ide.impl.iml
index ef2dcc6d3ba1..5288bf4d3367 100644
--- a/platform/platform-impl/intellij.platform.ide.impl.iml
+++ b/platform/platform-impl/intellij.platform.ide.impl.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/platform/platform-tests/durability/intellij.platform.durability.iml b/platform/platform-tests/durability/intellij.platform.durability.iml
index 321f0ff91ae9..6d945379bd8a 100644
--- a/platform/platform-tests/durability/intellij.platform.durability.iml
+++ b/platform/platform-tests/durability/intellij.platform.durability.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/platform/remote-driver/test-sdk/intellij.driver.sdk.iml b/platform/remote-driver/test-sdk/intellij.driver.sdk.iml
index a6517e51f0d7..53436f8b4d36 100644
--- a/platform/remote-driver/test-sdk/intellij.driver.sdk.iml
+++ b/platform/remote-driver/test-sdk/intellij.driver.sdk.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/platform/remoteDev-util/intellij.remoteDev.util.iml b/platform/remoteDev-util/intellij.remoteDev.util.iml
index 42edd974eb19..70e2765ef996 100644
--- a/platform/remoteDev-util/intellij.remoteDev.util.iml
+++ b/platform/remoteDev-util/intellij.remoteDev.util.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/platform/settings-local/intellij.platform.settings.local.iml b/platform/settings-local/intellij.platform.settings.local.iml
index 1427c9301e87..f724f85f27df 100644
--- a/platform/settings-local/intellij.platform.settings.local.iml
+++ b/platform/settings-local/intellij.platform.settings.local.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=com.intellij.util.xmlb.SettingsInternalApi -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=com.intellij.util.xmlb.SettingsInternalApi" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/platform/tips-of-the-day/intellij.platform.tips.iml b/platform/tips-of-the-day/intellij.platform.tips.iml
index a23003a5637a..93b3a679eb5b 100644
--- a/platform/tips-of-the-day/intellij.platform.tips.iml
+++ b/platform/tips-of-the-day/intellij.platform.tips.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/platform/util/intellij.platform.util.ui.iml b/platform/util/intellij.platform.util.ui.iml
index 168323438735..786995bc860e 100644
--- a/platform/util/intellij.platform.util.ui.iml
+++ b/platform/util/intellij.platform.util.ui.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/platform/vcs-impl/intellij.platform.vcs.impl.iml b/platform/vcs-impl/intellij.platform.vcs.impl.iml
index 86d2d1277776..676fed3305cc 100644
--- a/platform/vcs-impl/intellij.platform.vcs.impl.iml
+++ b/platform/vcs-impl/intellij.platform.vcs.impl.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/platform/whatsNew/intellij.platform.whatsNew.iml b/platform/whatsNew/intellij.platform.whatsNew.iml
index 8a5ca332a34c..15ce108ed47b 100644
--- a/platform/whatsNew/intellij.platform.whatsNew.iml
+++ b/platform/whatsNew/intellij.platform.whatsNew.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
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 d7e6516a184f..65f1e9b35dff 100644
--- a/platform/workspace/storage/tests/intellij.platform.workspace.storage.tests.iml
+++ b/platform/workspace/storage/tests/intellij.platform.workspace.storage.tests.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi -opt-in=com.intellij.platform.workspace.storage.WorkspaceEntityInternalApi -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=com.intellij.platform.workspace.storage.instrumentation.EntityStorageInstrumentationApi -opt-in=com.intellij.platform.workspace.storage.WorkspaceEntityInternalApi" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/completion-ml-ranking/intellij.completionMlRanking.iml b/plugins/completion-ml-ranking/intellij.completionMlRanking.iml
index adb6ceb38cd3..067fb52761e2 100644
--- a/plugins/completion-ml-ranking/intellij.completionMlRanking.iml
+++ b/plugins/completion-ml-ranking/intellij.completionMlRanking.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/devkit/devkit-core/intellij.devkit.core.iml b/plugins/devkit/devkit-core/intellij.devkit.core.iml
index eb369249ace4..b3ead8bd7eca 100644
--- a/plugins/devkit/devkit-core/intellij.devkit.core.iml
+++ b/plugins/devkit/devkit-core/intellij.devkit.core.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/devkit/intellij.kotlin.devkit/intellij.kotlin.devkit.iml b/plugins/devkit/intellij.kotlin.devkit/intellij.kotlin.devkit.iml
index 580e2b39edd4..f56692e1a25d 100644
--- a/plugins/devkit/intellij.kotlin.devkit/intellij.kotlin.devkit.iml
+++ b/plugins/devkit/intellij.kotlin.devkit/intellij.kotlin.devkit.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/editorconfig/intellij.editorconfig.iml b/plugins/editorconfig/intellij.editorconfig.iml
index dcfacd4eb6fa..69967fadaa20 100644
--- a/plugins/editorconfig/intellij.editorconfig.iml
+++ b/plugins/editorconfig/intellij.editorconfig.iml
@@ -5,7 +5,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/git4idea/intellij.vcs.git.iml b/plugins/git4idea/intellij.vcs.git.iml
index 2c0dc0dcafbc..428db8bc00e9 100644
--- a/plugins/git4idea/intellij.vcs.git.iml
+++ b/plugins/git4idea/intellij.vcs.git.iml
@@ -5,7 +5,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=kotlin.RequiresOptIn -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=kotlin.RequiresOptIn" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/github/intellij.vcs.github.iml b/plugins/github/intellij.vcs.github.iml
index 002cbc0f859c..6eb914cc265e 100644
--- a/plugins/github/intellij.vcs.github.iml
+++ b/plugins/github/intellij.vcs.github.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/gitlab/intellij.vcs.gitlab.iml b/plugins/gitlab/intellij.vcs.gitlab.iml
index 01f607fde546..19a510e0b619 100644
--- a/plugins/gitlab/intellij.vcs.gitlab.iml
+++ b/plugins/gitlab/intellij.vcs.gitlab.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/ide-features-trainer/intellij.featuresTrainer.iml b/plugins/ide-features-trainer/intellij.featuresTrainer.iml
index 5edcf4d717db..525db45643ed 100644
--- a/plugins/ide-features-trainer/intellij.featuresTrainer.iml
+++ b/plugins/ide-features-trainer/intellij.featuresTrainer.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/ide-startup/importSettings/intellij.ide.startup.importSettings.iml b/plugins/ide-startup/importSettings/intellij.ide.startup.importSettings.iml
index d1a168230ba7..b8e71c3f4317 100644
--- a/plugins/ide-startup/importSettings/intellij.ide.startup.importSettings.iml
+++ b/plugins/ide-startup/importSettings/intellij.ide.startup.importSettings.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/base/analysis-api-platform/kotlin.base.analysis-api-platform.iml b/plugins/kotlin/base/analysis-api-platform/kotlin.base.analysis-api-platform.iml
index 4d203eef0bda..66b13a890a53 100644
--- a/plugins/kotlin/base/analysis-api-platform/kotlin.base.analysis-api-platform.iml
+++ b/plugins/kotlin/base/analysis-api-platform/kotlin.base.analysis-api-platform.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.KaExperimentalApi -opt-in=org.jetbrains.kotlin.analysis.api.KaPlatformInterface -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.KaExperimentalApi -opt-in=org.jetbrains.kotlin.analysis.api.KaPlatformInterface" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/base/analysis-api/analysis-api-utils/kotlin.base.analysis-api.utils.iml b/plugins/kotlin/base/analysis-api/analysis-api-utils/kotlin.base.analysis-api.utils.iml
index d01ad40c079e..35d8af853648 100644
--- a/plugins/kotlin/base/analysis-api/analysis-api-utils/kotlin.base.analysis-api.utils.iml
+++ b/plugins/kotlin/base/analysis-api/analysis-api-utils/kotlin.base.analysis-api.utils.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/base/analysis/kotlin.base.analysis.iml b/plugins/kotlin/base/analysis/kotlin.base.analysis.iml
index 16fe62458982..7a3dc9125911 100644
--- a/plugins/kotlin/base/analysis/kotlin.base.analysis.iml
+++ b/plugins/kotlin/base/analysis/kotlin.base.analysis.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/base/code-insight/kotlin.base.code-insight.iml b/plugins/kotlin/base/code-insight/kotlin.base.code-insight.iml
index e88c5cceb293..f2d71155d498 100644
--- a/plugins/kotlin/base/code-insight/kotlin.base.code-insight.iml
+++ b/plugins/kotlin/base/code-insight/kotlin.base.code-insight.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/base/fe10/analysis-api-platform/kotlin.base.fe10.analysis-api-platform.iml b/plugins/kotlin/base/fe10/analysis-api-platform/kotlin.base.fe10.analysis-api-platform.iml
index 95dfaaae88d7..c52bfe3c6d34 100644
--- a/plugins/kotlin/base/fe10/analysis-api-platform/kotlin.base.fe10.analysis-api-platform.iml
+++ b/plugins/kotlin/base/fe10/analysis-api-platform/kotlin.base.fe10.analysis-api-platform.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.KaExperimentalApi -opt-in=org.jetbrains.kotlin.analysis.api.KaPlatformInterface -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.KaExperimentalApi -opt-in=org.jetbrains.kotlin.analysis.api.KaPlatformInterface" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/base/fe10/project-structure/kotlin.base.fe10.project-structure.iml b/plugins/kotlin/base/fe10/project-structure/kotlin.base.fe10.project-structure.iml
index ca542877b3b9..877b57d7c844 100644
--- a/plugins/kotlin/base/fe10/project-structure/kotlin.base.fe10.project-structure.iml
+++ b/plugins/kotlin/base/fe10/project-structure/kotlin.base.fe10.project-structure.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xopt-in=com.intellij.openapi.util.IntellijInternalApi  -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -Xopt-in=com.intellij.openapi.util.IntellijInternalApi  -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/base/fir/analysis-api-platform/kotlin.base.fir.analysis-api-platform.iml b/plugins/kotlin/base/fir/analysis-api-platform/kotlin.base.fir.analysis-api-platform.iml
index cd516cc9b84c..973029fc5e52 100644
--- a/plugins/kotlin/base/fir/analysis-api-platform/kotlin.base.fir.analysis-api-platform.iml
+++ b/plugins/kotlin/base/fir/analysis-api-platform/kotlin.base.fir.analysis-api-platform.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -opt-in=org.jetbrains.kotlin.analysis.api.KaPlatformInterface -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -opt-in=org.jetbrains.kotlin.analysis.api.KaPlatformInterface -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
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 62caad778773..dc95401e9864 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
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi -opt-in=org.jetbrains.kotlin.analysis.api.KaNonPublicApi -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi -opt-in=org.jetbrains.kotlin.analysis.api.KaNonPublicApi -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/base/fir/project-structure/kotlin.base.fir.project-structure.iml b/plugins/kotlin/base/fir/project-structure/kotlin.base.fir.project-structure.iml
index e73f76b9884f..693bba8d0776 100644
--- a/plugins/kotlin/base/fir/project-structure/kotlin.base.fir.project-structure.iml
+++ b/plugins/kotlin/base/fir/project-structure/kotlin.base.fir.project-structure.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xopt-in=com.intellij.openapi.util.IntellijInternalApi  -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -Xopt-in=com.intellij.openapi.util.IntellijInternalApi  -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/base/project-structure/kotlin.base.project-structure.iml b/plugins/kotlin/base/project-structure/kotlin.base.project-structure.iml
index ea0e89a21500..cd42ea2e3e51 100644
--- a/plugins/kotlin/base/project-structure/kotlin.base.project-structure.iml
+++ b/plugins/kotlin/base/project-structure/kotlin.base.project-structure.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.KaPlatformInterface -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.KaPlatformInterface" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/base/resources/kotlin.base.resources.iml b/plugins/kotlin/base/resources/kotlin.base.resources.iml
index 8be85e886d3a..3cf0765ed735 100644
--- a/plugins/kotlin/base/resources/kotlin.base.resources.iml
+++ b/plugins/kotlin/base/resources/kotlin.base.resources.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/base/scripting/kotlin.base.scripting.iml b/plugins/kotlin/base/scripting/kotlin.base.scripting.iml
index f3f5e629bdc9..7d6a1b062cb1 100644
--- a/plugins/kotlin/base/scripting/kotlin.base.scripting.iml
+++ b/plugins/kotlin/base/scripting/kotlin.base.scripting.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.KaPlatformInterface -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.KaPlatformInterface" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/base/statistics/kotlin.base.statistics.iml b/plugins/kotlin/base/statistics/kotlin.base.statistics.iml
index 3bf14c9c7bbc..73bea731ff4a 100644
--- a/plugins/kotlin/base/statistics/kotlin.base.statistics.iml
+++ b/plugins/kotlin/base/statistics/kotlin.base.statistics.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/code-insight/api/kotlin.code-insight.api.iml b/plugins/kotlin/code-insight/api/kotlin.code-insight.api.iml
index ce627ce4d7dc..3ddaa349b3c6 100644
--- a/plugins/kotlin/code-insight/api/kotlin.code-insight.api.iml
+++ b/plugins/kotlin/code-insight/api/kotlin.code-insight.api.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/code-insight/fixes-k2/kotlin.code-insight.fixes.k2.iml b/plugins/kotlin/code-insight/fixes-k2/kotlin.code-insight.fixes.k2.iml
index 8af15a4de219..c025460b973b 100644
--- a/plugins/kotlin/code-insight/fixes-k2/kotlin.code-insight.fixes.k2.iml
+++ b/plugins/kotlin/code-insight/fixes-k2/kotlin.code-insight.fixes.k2.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xcontext-receivers -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -Xcontext-receivers -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/code-insight/impl-base/kotlin.code-insight.impl-base.iml b/plugins/kotlin/code-insight/impl-base/kotlin.code-insight.impl-base.iml
index 813e42db49f3..e46a2035965a 100644
--- a/plugins/kotlin/code-insight/impl-base/kotlin.code-insight.impl-base.iml
+++ b/plugins/kotlin/code-insight/impl-base/kotlin.code-insight.impl-base.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/code-insight/inspections-k2/kotlin.code-insight.inspections.k2.iml b/plugins/kotlin/code-insight/inspections-k2/kotlin.code-insight.inspections.k2.iml
index f73529c72a3d..0e0af584297f 100644
--- a/plugins/kotlin/code-insight/inspections-k2/kotlin.code-insight.inspections.k2.iml
+++ b/plugins/kotlin/code-insight/inspections-k2/kotlin.code-insight.inspections.k2.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/code-insight/inspections-k2/tests/kotlin.code-insight.inspections.k2.tests.iml b/plugins/kotlin/code-insight/inspections-k2/tests/kotlin.code-insight.inspections.k2.tests.iml
index 120dc5bb6831..6cee70bef1c2 100644
--- a/plugins/kotlin/code-insight/inspections-k2/tests/kotlin.code-insight.inspections.k2.tests.iml
+++ b/plugins/kotlin/code-insight/inspections-k2/tests/kotlin.code-insight.inspections.k2.tests.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi  -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi " />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/code-insight/inspections-shared/kotlin.code-insight.inspections.shared.iml b/plugins/kotlin/code-insight/inspections-shared/kotlin.code-insight.inspections.shared.iml
index 2ff174b1baaa..8c11abd19996 100644
--- a/plugins/kotlin/code-insight/inspections-shared/kotlin.code-insight.inspections.shared.iml
+++ b/plugins/kotlin/code-insight/inspections-shared/kotlin.code-insight.inspections.shared.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/code-insight/intentions-k2/kotlin.code-insight.intentions.k2.iml b/plugins/kotlin/code-insight/intentions-k2/kotlin.code-insight.intentions.k2.iml
index c5301a1f8d12..11d754f06297 100644
--- a/plugins/kotlin/code-insight/intentions-k2/kotlin.code-insight.intentions.k2.iml
+++ b/plugins/kotlin/code-insight/intentions-k2/kotlin.code-insight.intentions.k2.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/code-insight/intentions-k2/tests/kotlin.code-insight.intentions.k2.tests.iml b/plugins/kotlin/code-insight/intentions-k2/tests/kotlin.code-insight.intentions.k2.tests.iml
index 1a269a414018..8dd82ae1cc05 100644
--- a/plugins/kotlin/code-insight/intentions-k2/tests/kotlin.code-insight.intentions.k2.tests.iml
+++ b/plugins/kotlin/code-insight/intentions-k2/tests/kotlin.code-insight.intentions.k2.tests.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi  -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi " />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/code-insight/intentions-shared/kotlin.code-insight.intentions.shared.iml b/plugins/kotlin/code-insight/intentions-shared/kotlin.code-insight.intentions.shared.iml
index b6f4435ffd5b..5e8ed25ad3b6 100644
--- a/plugins/kotlin/code-insight/intentions-shared/kotlin.code-insight.intentions.shared.iml
+++ b/plugins/kotlin/code-insight/intentions-shared/kotlin.code-insight.intentions.shared.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/code-insight/kotlin.code-insight.k2/kotlin.code-insight.k2.iml b/plugins/kotlin/code-insight/kotlin.code-insight.k2/kotlin.code-insight.k2.iml
index e69ccb00653c..bd519cb63078 100644
--- a/plugins/kotlin/code-insight/kotlin.code-insight.k2/kotlin.code-insight.k2.iml
+++ b/plugins/kotlin/code-insight/kotlin.code-insight.k2/kotlin.code-insight.k2.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/code-insight/line-markers/kotlin.code-insight.line-markers.k2.iml b/plugins/kotlin/code-insight/line-markers/kotlin.code-insight.line-markers.k2.iml
index 3067e2a30037..bde1fb545a77 100644
--- a/plugins/kotlin/code-insight/line-markers/kotlin.code-insight.line-markers.k2.iml
+++ b/plugins/kotlin/code-insight/line-markers/kotlin.code-insight.line-markers.k2.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/code-insight/live-templates-k2/kotlin.code-insight.live-templates.k2.iml b/plugins/kotlin/code-insight/live-templates-k2/kotlin.code-insight.live-templates.k2.iml
index 5508210add3e..92b793fdff5a 100644
--- a/plugins/kotlin/code-insight/live-templates-k2/kotlin.code-insight.live-templates.k2.iml
+++ b/plugins/kotlin/code-insight/live-templates-k2/kotlin.code-insight.live-templates.k2.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xopt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers  -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -Xopt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers  -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/code-insight/live-templates-shared/kotlin.code-insight.live-templates.shared.iml b/plugins/kotlin/code-insight/live-templates-shared/kotlin.code-insight.live-templates.shared.iml
index 4d59faa2ec84..da298a5fe112 100644
--- a/plugins/kotlin/code-insight/live-templates-shared/kotlin.code-insight.live-templates.shared.iml
+++ b/plugins/kotlin/code-insight/live-templates-shared/kotlin.code-insight.live-templates.shared.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/code-insight/override-implement-k2/kotlin.code-insight.override-implement.k2.iml b/plugins/kotlin/code-insight/override-implement-k2/kotlin.code-insight.override-implement.k2.iml
index ba666cde8562..000488c9d792 100644
--- a/plugins/kotlin/code-insight/override-implement-k2/kotlin.code-insight.override-implement.k2.iml
+++ b/plugins/kotlin/code-insight/override-implement-k2/kotlin.code-insight.override-implement.k2.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/code-insight/postfix-templates/kotlin.code-insight.postfix-templates.k2.iml b/plugins/kotlin/code-insight/postfix-templates/kotlin.code-insight.postfix-templates.k2.iml
index 0993be65bfc6..a1a5b92aacfb 100644
--- a/plugins/kotlin/code-insight/postfix-templates/kotlin.code-insight.postfix-templates.k2.iml
+++ b/plugins/kotlin/code-insight/postfix-templates/kotlin.code-insight.postfix-templates.k2.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xopt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -Xopt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/code-insight/structural-search-k2/kotlin.code-insight.structural-search.k2.iml b/plugins/kotlin/code-insight/structural-search-k2/kotlin.code-insight.structural-search.k2.iml
index 344211cc5786..3541d6bca3db 100644
--- a/plugins/kotlin/code-insight/structural-search-k2/kotlin.code-insight.structural-search.k2.iml
+++ b/plugins/kotlin/code-insight/structural-search-k2/kotlin.code-insight.structural-search.k2.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/code-insight/utils/kotlin.code-insight.utils.iml b/plugins/kotlin/code-insight/utils/kotlin.code-insight.utils.iml
index 8807a2b8c1a5..541b54780251 100644
--- a/plugins/kotlin/code-insight/utils/kotlin.code-insight.utils.iml
+++ b/plugins/kotlin/code-insight/utils/kotlin.code-insight.utils.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xcontext-receivers -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -Xcontext-receivers -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/compiler-plugins/assignment/common/kotlin.compiler-plugins.assignment.common.k2.iml b/plugins/kotlin/compiler-plugins/assignment/common/kotlin.compiler-plugins.assignment.common.k2.iml
index dae4aa016730..128b9ad491cd 100644
--- a/plugins/kotlin/compiler-plugins/assignment/common/kotlin.compiler-plugins.assignment.common.k2.iml
+++ b/plugins/kotlin/compiler-plugins/assignment/common/kotlin.compiler-plugins.assignment.common.k2.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/compiler-plugins/kotlinx-serialization/k2/kotlin.compiler-plugins.kotlinx-serialization.k2.iml b/plugins/kotlin/compiler-plugins/kotlinx-serialization/k2/kotlin.compiler-plugins.kotlinx-serialization.k2.iml
index cb2769a0e7d7..74c353470904 100644
--- a/plugins/kotlin/compiler-plugins/kotlinx-serialization/k2/kotlin.compiler-plugins.kotlinx-serialization.k2.iml
+++ b/plugins/kotlin/compiler-plugins/kotlinx-serialization/k2/kotlin.compiler-plugins.kotlinx-serialization.k2.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/compiler-plugins/parcelize/common/kotlin.compiler-plugins.parcelize.common.iml b/plugins/kotlin/compiler-plugins/parcelize/common/kotlin.compiler-plugins.parcelize.common.iml
index 05bcdeadc130..b535e56c5264 100644
--- a/plugins/kotlin/compiler-plugins/parcelize/common/kotlin.compiler-plugins.parcelize.common.iml
+++ b/plugins/kotlin/compiler-plugins/parcelize/common/kotlin.compiler-plugins.parcelize.common.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/compiler-plugins/parcelize/k1/kotlin.compiler-plugins.parcelize.k1.iml b/plugins/kotlin/compiler-plugins/parcelize/k1/kotlin.compiler-plugins.parcelize.k1.iml
index 6dd4fff27227..4f3cee030aaa 100644
--- a/plugins/kotlin/compiler-plugins/parcelize/k1/kotlin.compiler-plugins.parcelize.k1.iml
+++ b/plugins/kotlin/compiler-plugins/parcelize/k1/kotlin.compiler-plugins.parcelize.k1.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/compiler-plugins/parcelize/k2/kotlin.compiler-plugins.parcelize.k2.iml b/plugins/kotlin/compiler-plugins/parcelize/k2/kotlin.compiler-plugins.parcelize.k2.iml
index b8f70e64e82c..0f859259b804 100644
--- a/plugins/kotlin/compiler-plugins/parcelize/k2/kotlin.compiler-plugins.parcelize.k2.iml
+++ b/plugins/kotlin/compiler-plugins/parcelize/k2/kotlin.compiler-plugins.parcelize.k2.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/completion/impl-k1/kotlin.completion.impl.k1.iml b/plugins/kotlin/completion/impl-k1/kotlin.completion.impl.k1.iml
index 371f5fee90a1..2bde30260792 100644
--- a/plugins/kotlin/completion/impl-k1/kotlin.completion.impl.k1.iml
+++ b/plugins/kotlin/completion/impl-k1/kotlin.completion.impl.k1.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/completion/impl-k2/kotlin.completion.impl.k2.iml b/plugins/kotlin/completion/impl-k2/kotlin.completion.impl.k2.iml
index a8514bbc9268..b7b69923974b 100644
--- a/plugins/kotlin/completion/impl-k2/kotlin.completion.impl.k2.iml
+++ b/plugins/kotlin/completion/impl-k2/kotlin.completion.impl.k2.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xopt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -Xopt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/completion/impl-shared/kotlin.completion.impl.shared.iml b/plugins/kotlin/completion/impl-shared/kotlin.completion.impl.shared.iml
index c2310224f0a9..3ccb16d2d541 100644
--- a/plugins/kotlin/completion/impl-shared/kotlin.completion.impl.shared.iml
+++ b/plugins/kotlin/completion/impl-shared/kotlin.completion.impl.shared.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/fir/kotlin.fir.iml b/plugins/kotlin/fir/kotlin.fir.iml
index 2fd9b24f3886..0773bb48513a 100644
--- a/plugins/kotlin/fir/kotlin.fir.iml
+++ b/plugins/kotlin/fir/kotlin.fir.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/fir/tests/kotlin.fir.tests.iml b/plugins/kotlin/fir/tests/kotlin.fir.tests.iml
index 1040d98f4a3b..08fe2379af02 100644
--- a/plugins/kotlin/fir/tests/kotlin.fir.tests.iml
+++ b/plugins/kotlin/fir/tests/kotlin.fir.tests.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
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 404ffbdb6363..9ba8ea9d21e2 100644
--- a/plugins/kotlin/gradle/gradle-java/kotlin.gradle.gradle-java.iml
+++ b/plugins/kotlin/gradle/gradle-java/kotlin.gradle.gradle-java.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=org.jetbrains.kotlin.gradle.ExperimentalGradleToolingApi -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=org.jetbrains.kotlin.gradle.ExperimentalGradleToolingApi -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/gradle/gradle/kotlin.gradle.gradle.iml b/plugins/kotlin/gradle/gradle/kotlin.gradle.gradle.iml
index d0fc9ff6c9ea..53cae360f817 100644
--- a/plugins/kotlin/gradle/gradle/kotlin.gradle.gradle.iml
+++ b/plugins/kotlin/gradle/gradle/kotlin.gradle.gradle.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=org.jetbrains.kotlin.gradle.ExperimentalGradleToolingApi -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=org.jetbrains.kotlin.gradle.ExperimentalGradleToolingApi -opt-in=com.intellij.openapi.util.IntellijInternalApi" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/highlighting/highlighting-k2/kotlin.highlighting.k2.iml b/plugins/kotlin/highlighting/highlighting-k2/kotlin.highlighting.k2.iml
index 84bc81a10f0e..bdb928221f4f 100644
--- a/plugins/kotlin/highlighting/highlighting-k2/kotlin.highlighting.k2.iml
+++ b/plugins/kotlin/highlighting/highlighting-k2/kotlin.highlighting.k2.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi -opt-in=org.jetbrains.kotlin.analysis.api.KaNonPublicApi -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi -opt-in=org.jetbrains.kotlin.analysis.api.KaNonPublicApi -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/highlighting/highlighting-shared/kotlin.highlighting.shared.iml b/plugins/kotlin/highlighting/highlighting-shared/kotlin.highlighting.shared.iml
index 77c3311c480f..3f89ff63af34 100644
--- a/plugins/kotlin/highlighting/highlighting-shared/kotlin.highlighting.shared.iml
+++ b/plugins/kotlin/highlighting/highlighting-shared/kotlin.highlighting.shared.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/idea/kotlin.idea.iml b/plugins/kotlin/idea/kotlin.idea.iml
index 09f20808902d..11bcde1a338c 100644
--- a/plugins/kotlin/idea/kotlin.idea.iml
+++ b/plugins/kotlin/idea/kotlin.idea.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/injection/base/kotlin.base.injection.iml b/plugins/kotlin/injection/base/kotlin.base.injection.iml
index e321e389d6d9..a43d51d00a01 100644
--- a/plugins/kotlin/injection/base/kotlin.base.injection.iml
+++ b/plugins/kotlin/injection/base/kotlin.base.injection.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xcontext-receivers -Xjvm-default=all -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xcontext-receivers -Xjvm-default=all -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/injection/base/tests/kotlin.base.injection.tests.iml b/plugins/kotlin/injection/base/tests/kotlin.base.injection.tests.iml
index ce8224d72026..5be3c3e2f871 100644
--- a/plugins/kotlin/injection/base/tests/kotlin.base.injection.tests.iml
+++ b/plugins/kotlin/injection/base/tests/kotlin.base.injection.tests.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xcontext-receivers -Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xcontext-receivers -Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/injection/k1/kotlin.injection.k1.iml b/plugins/kotlin/injection/k1/kotlin.injection.k1.iml
index 1bc1c79376b2..62e2da4c65f5 100644
--- a/plugins/kotlin/injection/k1/kotlin.injection.k1.iml
+++ b/plugins/kotlin/injection/k1/kotlin.injection.k1.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xcontext-receivers -Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xcontext-receivers -Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/injection/k1/tests/kotlin.injection.tests.iml b/plugins/kotlin/injection/k1/tests/kotlin.injection.tests.iml
index c81bbe6503d5..8a685058e95a 100644
--- a/plugins/kotlin/injection/k1/tests/kotlin.injection.tests.iml
+++ b/plugins/kotlin/injection/k1/tests/kotlin.injection.tests.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xcontext-receivers -Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xcontext-receivers -Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/injection/k2/kotlin.injection.k2.iml b/plugins/kotlin/injection/k2/kotlin.injection.k2.iml
index b504d9617dcf..1e4dbb5b9ead 100644
--- a/plugins/kotlin/injection/k2/kotlin.injection.k2.iml
+++ b/plugins/kotlin/injection/k2/kotlin.injection.k2.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xcontext-receivers -Xjvm-default=all -Xlambdas=class -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction" />
+          <option name="additionalArguments" value="-Xcontext-receivers -Xjvm-default=all -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/injection/k2/tests/kotlin.injection.k2.tests.iml b/plugins/kotlin/injection/k2/tests/kotlin.injection.k2.tests.iml
index 234f980c42e3..e70ee4cde1c4 100644
--- a/plugins/kotlin/injection/k2/tests/kotlin.injection.k2.tests.iml
+++ b/plugins/kotlin/injection/k2/tests/kotlin.injection.k2.tests.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xcontext-receivers -Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xcontext-receivers -Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/j2k/k1.new.post-processing/kotlin.j2k.k1.new.post-processing.iml b/plugins/kotlin/j2k/k1.new.post-processing/kotlin.j2k.k1.new.post-processing.iml
index fe868fab0cd4..3d8d9bd19aa8 100644
--- a/plugins/kotlin/j2k/k1.new.post-processing/kotlin.j2k.k1.new.post-processing.iml
+++ b/plugins/kotlin/j2k/k1.new.post-processing/kotlin.j2k.k1.new.post-processing.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/j2k/k1.new/kotlin.j2k.k1.new.iml b/plugins/kotlin/j2k/k1.new/kotlin.j2k.k1.new.iml
index 93ce817f79ff..73cf4f57a675 100644
--- a/plugins/kotlin/j2k/k1.new/kotlin.j2k.k1.new.iml
+++ b/plugins/kotlin/j2k/k1.new/kotlin.j2k.k1.new.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/j2k/k1.new/tests/kotlin.j2k.k1.new.tests.iml b/plugins/kotlin/j2k/k1.new/tests/kotlin.j2k.k1.new.tests.iml
index 14f868b6b2a0..40b510c19921 100644
--- a/plugins/kotlin/j2k/k1.new/tests/kotlin.j2k.k1.new.tests.iml
+++ b/plugins/kotlin/j2k/k1.new/tests/kotlin.j2k.k1.new.tests.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/j2k/k1.old/kotlin.j2k.k1.old.iml b/plugins/kotlin/j2k/k1.old/kotlin.j2k.k1.old.iml
index 06fa657ec3e2..e215b46a6562 100644
--- a/plugins/kotlin/j2k/k1.old/kotlin.j2k.k1.old.iml
+++ b/plugins/kotlin/j2k/k1.old/kotlin.j2k.k1.old.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/j2k/k2/kotlin.j2k.k2.iml b/plugins/kotlin/j2k/k2/kotlin.j2k.k2.iml
index 49b9e90849aa..c5223b0349ca 100644
--- a/plugins/kotlin/j2k/k2/kotlin.j2k.k2.iml
+++ b/plugins/kotlin/j2k/k2/kotlin.j2k.k2.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/j2k/k2/tests/kotlin.j2k.k2.tests.iml b/plugins/kotlin/j2k/k2/tests/kotlin.j2k.k2.tests.iml
index 57115183e099..89cb9ce89114 100644
--- a/plugins/kotlin/j2k/k2/tests/kotlin.j2k.k2.tests.iml
+++ b/plugins/kotlin/j2k/k2/tests/kotlin.j2k.k2.tests.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/j2k/shared/kotlin.j2k.shared.iml b/plugins/kotlin/j2k/shared/kotlin.j2k.shared.iml
index 79f373c042ff..caa930074863 100644
--- a/plugins/kotlin/j2k/shared/kotlin.j2k.shared.iml
+++ b/plugins/kotlin/j2k/shared/kotlin.j2k.shared.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/j2k/shared/tests/kotlin.j2k.shared.tests.iml b/plugins/kotlin/j2k/shared/tests/kotlin.j2k.shared.tests.iml
index 6019262d09c8..9febec283944 100644
--- a/plugins/kotlin/j2k/shared/tests/kotlin.j2k.shared.tests.iml
+++ b/plugins/kotlin/j2k/shared/tests/kotlin.j2k.shared.tests.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/jvm-debugger/core-fe10/kotlin.jvm-debugger.core-fe10.iml b/plugins/kotlin/jvm-debugger/core-fe10/kotlin.jvm-debugger.core-fe10.iml
index 128b4c99c5ea..4ca335feec4b 100644
--- a/plugins/kotlin/jvm-debugger/core-fe10/kotlin.jvm-debugger.core-fe10.iml
+++ b/plugins/kotlin/jvm-debugger/core-fe10/kotlin.jvm-debugger.core-fe10.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/jvm-debugger/core/kotlin.jvm-debugger.core.iml b/plugins/kotlin/jvm-debugger/core/kotlin.jvm-debugger.core.iml
index 7122ad672baf..232b0b2cb0fa 100644
--- a/plugins/kotlin/jvm-debugger/core/kotlin.jvm-debugger.core.iml
+++ b/plugins/kotlin/jvm-debugger/core/kotlin.jvm-debugger.core.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/jvm-debugger/coroutines/kotlin.jvm-debugger.coroutines.iml b/plugins/kotlin/jvm-debugger/coroutines/kotlin.jvm-debugger.coroutines.iml
index 7bb89c1bc44a..0fc410ba5353 100644
--- a/plugins/kotlin/jvm-debugger/coroutines/kotlin.jvm-debugger.coroutines.iml
+++ b/plugins/kotlin/jvm-debugger/coroutines/kotlin.jvm-debugger.coroutines.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/kotlin.searching/base/kotlin.searching.base.iml b/plugins/kotlin/kotlin.searching/base/kotlin.searching.base.iml
index 01f8d78c6ce8..8191ec4ab6b9 100644
--- a/plugins/kotlin/kotlin.searching/base/kotlin.searching.base.iml
+++ b/plugins/kotlin/kotlin.searching/base/kotlin.searching.base.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/kotlin.searching/kotlin.searching.k2.iml b/plugins/kotlin/kotlin.searching/kotlin.searching.k2.iml
index 4212599442a8..03ad1cdd9a80 100644
--- a/plugins/kotlin/kotlin.searching/kotlin.searching.k2.iml
+++ b/plugins/kotlin/kotlin.searching/kotlin.searching.k2.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/navigation/kotlin.navigation.iml b/plugins/kotlin/navigation/kotlin.navigation.iml
index d81a7dbbbcb9..737bb93d16e0 100644
--- a/plugins/kotlin/navigation/kotlin.navigation.iml
+++ b/plugins/kotlin/navigation/kotlin.navigation.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/navigation/tests/kotlin.navigation.tests.iml b/plugins/kotlin/navigation/tests/kotlin.navigation.tests.iml
index 9bbc40c46673..a715bfaafcce 100644
--- a/plugins/kotlin/navigation/tests/kotlin.navigation.tests.iml
+++ b/plugins/kotlin/navigation/tests/kotlin.navigation.tests.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi  -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi " />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/onboarding-gradle/kotlin.onboarding.gradle.iml b/plugins/kotlin/onboarding-gradle/kotlin.onboarding.gradle.iml
index 403167e52f8b..8f253774e624 100644
--- a/plugins/kotlin/onboarding-gradle/kotlin.onboarding.gradle.iml
+++ b/plugins/kotlin/onboarding-gradle/kotlin.onboarding.gradle.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/onboarding/kotlin.onboarding.iml b/plugins/kotlin/onboarding/kotlin.onboarding.iml
index bcf03b6d9a2f..858bf430c080 100644
--- a/plugins/kotlin/onboarding/kotlin.onboarding.iml
+++ b/plugins/kotlin/onboarding/kotlin.onboarding.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.common/kotlin.refactorings.common.iml b/plugins/kotlin/refactorings/kotlin.refactorings.common/kotlin.refactorings.common.iml
index 7f6fd4923a12..20ad0eddf65e 100644
--- a/plugins/kotlin/refactorings/kotlin.refactorings.common/kotlin.refactorings.common.iml
+++ b/plugins/kotlin/refactorings/kotlin.refactorings.common/kotlin.refactorings.common.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -Xcontext-receivers -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.k2/kotlin.refactorings.k2.iml b/plugins/kotlin/refactorings/kotlin.refactorings.k2/kotlin.refactorings.k2.iml
index 16ab146faecb..f82e57f1afdb 100644
--- a/plugins/kotlin/refactorings/kotlin.refactorings.k2/kotlin.refactorings.k2.iml
+++ b/plugins/kotlin/refactorings/kotlin.refactorings.k2/kotlin.refactorings.k2.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi -opt-in=org.jetbrains.kotlin.analysis.api.KaNonPublicApi -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi -opt-in=org.jetbrains.kotlin.analysis.api.KaNonPublicApi -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/kotlin.refactorings.move.k2.iml b/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/kotlin.refactorings.move.k2.iml
index d4622455fc86..da81aeb76a9c 100644
--- a/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/kotlin.refactorings.move.k2.iml
+++ b/plugins/kotlin/refactorings/kotlin.refactorings.move.k2/kotlin.refactorings.move.k2.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xcontext-receivers -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.tests.k2/kotlin.refactorings.tests.k2.iml b/plugins/kotlin/refactorings/kotlin.refactorings.tests.k2/kotlin.refactorings.tests.k2.iml
index 9d087edb1c50..3dfb4f4d5e0b 100644
--- a/plugins/kotlin/refactorings/kotlin.refactorings.tests.k2/kotlin.refactorings.tests.k2.iml
+++ b/plugins/kotlin/refactorings/kotlin.refactorings.tests.k2/kotlin.refactorings.tests.k2.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xcontext-receivers -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -Xcontext-receivers -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/refactorings/rename.k2/kotlin.refactorings.rename.k2.iml b/plugins/kotlin/refactorings/rename.k2/kotlin.refactorings.rename.k2.iml
index 128fd9f124a3..93a2fe0223ca 100644
--- a/plugins/kotlin/refactorings/rename.k2/kotlin.refactorings.rename.k2.iml
+++ b/plugins/kotlin/refactorings/rename.k2/kotlin.refactorings.rename.k2.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi -Xcontext-receivers -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -opt-in=org.jetbrains.kotlin.utils.addToStdlib.UnsafeCastFunction -opt-in=org.jetbrains.kotlin.analysis.api.permissions.KaAllowProhibitedAnalyzeFromWriteAction -opt-in=org.jetbrains.kotlin.analysis.api.KaIdeApi -Xcontext-receivers" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/scripting/kotlin.scripting.iml b/plugins/kotlin/scripting/kotlin.scripting.iml
index ecb7f0ca4599..30f6c154798c 100644
--- a/plugins/kotlin/scripting/kotlin.scripting.iml
+++ b/plugins/kotlin/scripting/kotlin.scripting.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xallow-kotlin-package -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -Xallow-kotlin-package -opt-in=com.intellij.openapi.util.IntellijInternalApi" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/kotlin/util/test-generator-fir/kotlin.util.test-generator-fir.iml b/plugins/kotlin/util/test-generator-fir/kotlin.util.test-generator-fir.iml
index ae83f976f33e..9f6bdc3a5772 100644
--- a/plugins/kotlin/util/test-generator-fir/kotlin.util.test-generator-fir.iml
+++ b/plugins/kotlin/util/test-generator-fir/kotlin.util.test-generator-fir.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi  -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi " />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/markdown/compose/intellij.markdown.compose.preview.iml b/plugins/markdown/compose/intellij.markdown.compose.preview.iml
index 8c278c988982..9be15351f7dd 100644
--- a/plugins/markdown/compose/intellij.markdown.compose.preview.iml
+++ b/plugins/markdown/compose/intellij.markdown.compose.preview.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/repository-search/intellij.repository.search.iml b/plugins/repository-search/intellij.repository.search.iml
index 2b2881878e5b..78093cfdbe20 100644
--- a/plugins/repository-search/intellij.repository.search.iml
+++ b/plugins/repository-search/intellij.repository.search.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=kotlinx.serialization.InternalSerializationApi -opt-in=kotlinx.serialization.ExperimentalSerializationApi -opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=kotlinx.serialization.InternalSerializationApi -opt-in=kotlinx.serialization.ExperimentalSerializationApi -opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/settings-sync/intellij.settingsSync.iml b/plugins/settings-sync/intellij.settingsSync.iml
index c9ae483b13c6..28f960449ff3 100644
--- a/plugins/settings-sync/intellij.settingsSync.iml
+++ b/plugins/settings-sync/intellij.settingsSync.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/terminal/intellij.terminal.iml b/plugins/terminal/intellij.terminal.iml
index 73fca32a4e70..8e9c6f2424b8 100644
--- a/plugins/terminal/intellij.terminal.iml
+++ b/plugins/terminal/intellij.terminal.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/terminal/sh/intellij.terminal.sh.iml b/plugins/terminal/sh/intellij.terminal.sh.iml
index 9b0b64e45fae..5df1efd7cbc8 100644
--- a/plugins/terminal/sh/intellij.terminal.sh.iml
+++ b/plugins/terminal/sh/intellij.terminal.sh.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/textmate/core/intellij.textmate.core.iml b/plugins/textmate/core/intellij.textmate.core.iml
index 8d0c2a38c8a8..46bcce20b1b7 100644
--- a/plugins/textmate/core/intellij.textmate.core.iml
+++ b/plugins/textmate/core/intellij.textmate.core.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/textmate/intellij.textmate.iml b/plugins/textmate/intellij.textmate.iml
index 01edd27f20f7..4852fdfe9a80 100644
--- a/plugins/textmate/intellij.textmate.iml
+++ b/plugins/textmate/intellij.textmate.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/plugins/yaml/editing/intellij.yaml.editing.iml b/plugins/yaml/editing/intellij.yaml.editing.iml
index 5ab0636e7ce7..8a8b5935ba09 100644
--- a/plugins/yaml/editing/intellij.yaml.editing.iml
+++ b/plugins/yaml/editing/intellij.yaml.editing.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=com.intellij.openapi.util.IntellijInternalApi" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/tools/intellij.tools.ide.metrics.collector/intellij.tools.ide.metrics.collector.iml b/tools/intellij.tools.ide.metrics.collector/intellij.tools.ide.metrics.collector.iml
index df8e47ae27be..4b26663bf8f2 100644
--- a/tools/intellij.tools.ide.metrics.collector/intellij.tools.ide.metrics.collector.iml
+++ b/tools/intellij.tools.ide.metrics.collector/intellij.tools.ide.metrics.collector.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=kotlin.time.ExperimentalTime -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=kotlin.time.ExperimentalTime" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>
diff --git a/tools/intellij.tools.ide.util.common/intellij.tools.ide.util.common.iml b/tools/intellij.tools.ide.util.common/intellij.tools.ide.util.common.iml
index cbfba63fb263..f542dafbde88 100644
--- a/tools/intellij.tools.ide.util.common/intellij.tools.ide.util.common.iml
+++ b/tools/intellij.tools.ide.util.common/intellij.tools.ide.util.common.iml
@@ -4,7 +4,7 @@
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
         <compilerSettings>
-          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=kotlin.time.ExperimentalTime -Xlambdas=class" />
+          <option name="additionalArguments" value="-Xjvm-default=all -opt-in=kotlin.time.ExperimentalTime" />
         </compilerSettings>
         <compilerArguments>
           <stringArguments>