diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrCommonMemberStorage.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrCommonMemberStorage.kt
index bcfefdddc83..ebe7ace12c3 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrCommonMemberStorage.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrCommonMemberStorage.kt
@@ -7,8 +7,6 @@ package org.jetbrains.kotlin.fir.backend
 
 import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.signaturer.FirBasedSignatureComposer
-import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag
-import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrFactoryImpl
 import org.jetbrains.kotlin.ir.util.IdSignatureComposer
@@ -39,5 +37,5 @@ class Fir2IrCommonMemberStorage(
 
     val fakeOverridesInClass: MutableMap<IrClass, MutableMap<Fir2IrDeclarationStorage.FakeOverrideKey, FirCallableDeclaration>> = mutableMapOf()
 
-    val irFakeOverridesForRealFirFakeOverrideMap: MutableMap<Fir2IrDeclarationStorage.FakeOverrideIdentifier, IrDeclaration> = mutableMapOf()
+    val irFakeOverridesForFirFakeOverrideMap: MutableMap<Fir2IrDeclarationStorage.FakeOverrideIdentifier, IrDeclaration> = mutableMapOf()
 }
diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt
index f262d66c233..8a93173e049 100644
--- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt
+++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt
@@ -127,8 +127,8 @@ class Fir2IrDeclarationStorage(
      * The key here is a pair of the original function (first not f/o) and lookup tag of class for which this fake override was created
      * THe value is IR function, build for this fake override during fir2ir translation of the module that contains parent class of this function
      */
-    private val irFakeOverridesForRealFirFakeOverrideMap: MutableMap<FakeOverrideIdentifier, IrDeclaration> =
-        commonMemberStorage.irFakeOverridesForRealFirFakeOverrideMap
+    private val irFakeOverridesForFirFakeOverrideMap: MutableMap<FakeOverrideIdentifier, IrDeclaration> =
+        commonMemberStorage.irFakeOverridesForFirFakeOverrideMap
 
     data class FakeOverrideIdentifier(val originalSymbol: FirCallableSymbol<*>, val dispatchReceiverLookupTag: ConeClassLikeLookupTag)
 
@@ -720,12 +720,16 @@ class Fir2IrDeclarationStorage(
                 created.overriddenSymbols += getIrFunctionSymbol(it) as IrSimpleFunctionSymbol
             }
         }
-        if (function.isSubstitutionOrIntersectionOverride) {
+        if (function.isFakeOverride(fakeOverrideOwnerLookupTag)) {
             val originalFunction = function.unwrapFakeOverrides()
-            val key = FakeOverrideIdentifier(originalFunction.symbol, function.dispatchReceiverClassLookupTagOrNull()!!)
-            irFakeOverridesForRealFirFakeOverrideMap[key] = created
+            val key = FakeOverrideIdentifier(
+                originalFunction.symbol,
+                fakeOverrideOwnerLookupTag ?: function.containingClassLookupTag()!!
+            )
+            irFakeOverridesForFirFakeOverrideMap[key] = created
+        } else {
+            functionCache[function] = created
         }
-        functionCache[function] = created
         return created
     }
 
@@ -1023,7 +1027,7 @@ class Fir2IrDeclarationStorage(
         thisReceiverOwner: IrClass? = computeThisReceiverOwner(irParent),
         predefinedOrigin: IrDeclarationOrigin? = null,
         isLocal: Boolean = false,
-        fakeOverrideOwnerLookupTag: ConeClassLikeLookupTag? = (irParent as? IrClass)?.classId?.toLookupTag(),
+        fakeOverrideOwnerLookupTag: ConeClassLikeLookupTag? = null,
     ): IrProperty = convertCatching(property) {
         val origin =
             if (property.isStatic && property.name in ENUM_SYNTHETIC_NAMES) IrDeclarationOrigin.ENUM_CLASS_SPECIAL_MEMBER
@@ -1137,17 +1141,25 @@ class Fir2IrDeclarationStorage(
                     leaveScope(this)
                 }
             }
-            if (property.isSubstitutionOrIntersectionOverride) {
+            if (property.isFakeOverride(fakeOverrideOwnerLookupTag)) {
                 val originalProperty = property.unwrapFakeOverrides()
-                val key = FakeOverrideIdentifier(originalProperty.symbol, property.dispatchReceiverClassLookupTagOrNull()!!)
-                irFakeOverridesForRealFirFakeOverrideMap[key] = result
+                val key = FakeOverrideIdentifier(
+                    originalProperty.symbol,
+                    fakeOverrideOwnerLookupTag ?: property.containingClassLookupTag()!!
+                )
+                irFakeOverridesForFirFakeOverrideMap[key] = result
+            } else {
+                propertyCache[property] = result
             }
-            propertyCache[property] = result
             result
         }
     }
 
-    fun getCachedIrProperty(property: FirProperty): IrProperty? = propertyCache[property]
+    fun getCachedIrProperty(property: FirProperty): IrProperty? {
+        return getCachedIrProperty(property, fakeOverrideOwnerLookupTag = null) {
+            signatureComposer.composeSignature(property)
+        }
+    }
 
     fun getCachedIrProperty(
         property: FirProperty,
@@ -1171,33 +1183,41 @@ class Fir2IrDeclarationStorage(
         signatureCalculator: () -> IdSignature?,
         referenceIfAny: (IdSignature) -> IC?
     ): IC? {
-        val isFakeFakeOverride = fakeOverrideOwnerLookupTag != null && fakeOverrideOwnerLookupTag != declaration.containingClassLookupTag()
-        if (!isFakeFakeOverride) {
+        /*
+         * There should be two types of declarations:
+         * 1. Real declarations. They are stored in simple FirDeclaration -> IrDeclaration [cache]
+         * 2. Fake overrides. They are stored in [irFakeOverridesForRealFirFakeOverrideMap], where the key is the original real declaration and
+         *      specific dispatch receiver of particular fake override. This cache is needed, because we can have two different FIR
+         *      f/o for common and platform modules (because they are session dependent), but we should create IR declaration for them
+         *      only once. So [irFakeOverridesForFirFakeOverrideMap] is shared between fir2ir conversion for different MPP modules
+         *      (see KT-58229)
+         *
+         * Unfortunately, in the current implementation, there is a special case.
+         * If the fake override exists in FIR (i.e., it is an intersection or substitution override), and it comes from dependency module,
+         * corresponding LazyIrFunction or LazyIrProperty can be created, ignoring the fact that it is a fake override.
+         * In that case, it can sometimes be put to the wrong cache, as a normal declaration.
+         *
+         * To workaround this, we look up such declarations in both caches.
+         */
+        val isFakeOverride = declaration.isFakeOverride(fakeOverrideOwnerLookupTag)
+        if (isFakeOverride) {
+            val key = FakeOverrideIdentifier(
+                declaration.unwrapFakeOverrides().symbol,
+                fakeOverrideOwnerLookupTag ?: declaration.containingClassLookupTag()!!
+            )
+            irFakeOverridesForFirFakeOverrideMap[key]?.let { return it as IC }
+        } else {
             cache[declaration]?.let { return it }
         }
-        /*
-         * There are three types of declarations:
-         * 1. Real declarations. They are stored in simple FirDeclaration -> IrDeclaration cache
-         * 2. "Real" fake overrides (fake overrides, which have their own declaration in FIR, such as substitution and intersection
-         *      overrides). They are stored in [irFakeOverridesForRealFirFakeOverrideMap], where key is original real declaration and
-         *      specific dispatch receiver of particular fake override. This cache is needed, because we can have two different FIR
-         *      f/o for common and platform modules (because they are session dependant), but we should create IR declaration for them
-         *      only once. So [irFakeOverridesForRealFirFakeOverrideMap] is shared between fir2ir conversion for different MPP modules
-         *      (see KT-58229)
-         * 3. "Fake" fake overrides (fake overrides without some real FIR declaration). Right now they are stored in symbol table.
-         *     TODO: they also should be stored in [irFakeOverridesForRealFirFakeOverrideMap], see KT-60850
-         */
-        val isRealFakeOverride = declaration.isSubstitutionOrIntersectionOverride
-        if (isRealFakeOverride) {
-            val key = FakeOverrideIdentifier(
-                declaration.originalIfFakeOverride()!!.symbol,
-                declaration.dispatchReceiverClassLookupTagOrNull()!!
-            )
-            irFakeOverridesForRealFirFakeOverrideMap[key]?.let { return it as IC }
+
+        // TODO: Special case mentioned above. Should be removed after fixing creation. KT-61085
+        if (declaration.isSubstitutionOrIntersectionOverride) {
+            cache[declaration]?.let { return it }
         }
+
         return signatureCalculator()?.let { signature ->
             referenceIfAny(signature)?.let { irDeclaration ->
-                if (!isFakeFakeOverride) {
+                if (!isFakeOverride) {
                     cache[declaration] = irDeclaration
                 }
                 irDeclaration
@@ -1931,4 +1951,13 @@ class Fir2IrDeclarationStorage(
             }
         }
     }
+
+    private fun FirCallableDeclaration.isFakeOverride(fakeOverrideOwnerLookupTag: ConeClassLikeLookupTag?): Boolean {
+        if (isSubstitutionOrIntersectionOverride) return true
+        if (fakeOverrideOwnerLookupTag == null) return false
+        // this condition is true for all places when we are trying to create "fake" fake overrides in IR
+        // "fake" fake overrides are f/o which are presented in IR but have no corresponding FIR f/o
+        return fakeOverrideOwnerLookupTag != containingClassLookupTag()
+    }
+
 }
diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
index ae097ff8f4c..2594109982f 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
@@ -18259,6 +18259,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
             runTest("compiler/testData/codegen/box/fakeOverride/internalFromFriendModule.kt");
         }
 
+        @Test
+        @TestMetadata("intersectionInLocal.kt")
+        public void testIntersectionInLocal() throws Exception {
+            runTest("compiler/testData/codegen/box/fakeOverride/intersectionInLocal.kt");
+        }
+
         @Test
         @TestMetadata("kt49371.kt")
         public void testKt49371() throws Exception {
@@ -18289,6 +18295,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
             runTest("compiler/testData/codegen/box/fakeOverride/propertySetter.kt");
         }
 
+        @Test
+        @TestMetadata("substitutionInLocal.kt")
+        public void testSubstitutionInLocal() throws Exception {
+            runTest("compiler/testData/codegen/box/fakeOverride/substitutionInLocal.kt");
+        }
+
         @Test
         @TestMetadata("varianceOverload.kt")
         public void testVarianceOverload() throws Exception {
@@ -33887,6 +33899,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt");
                 }
 
+                @Test
+                @TestMetadata("intersectionOverrideWithDefaultParameterInCommonModule.kt")
+                public void testIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt");
+                }
+
                 @Test
                 @TestMetadata("kt-51753-1.kt")
                 public void testKt_51753_1() throws Exception {
@@ -33911,6 +33929,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt");
                 }
 
+                @Test
+                @TestMetadata("localIntersectionOverrideWithDefaultParameterInCommonModule.kt")
+                public void testLocalIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt");
+                }
+
                 @Test
                 @TestMetadata("localSubstitutionOverrideInCommonModule.kt")
                 public void testLocalSubstitutionOverrideInCommonModule() throws Exception {
diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
index 3971a2b4b48..7fa50534a71 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
@@ -18259,6 +18259,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
             runTest("compiler/testData/codegen/box/fakeOverride/internalFromFriendModule.kt");
         }
 
+        @Test
+        @TestMetadata("intersectionInLocal.kt")
+        public void testIntersectionInLocal() throws Exception {
+            runTest("compiler/testData/codegen/box/fakeOverride/intersectionInLocal.kt");
+        }
+
         @Test
         @TestMetadata("kt49371.kt")
         public void testKt49371() throws Exception {
@@ -18289,6 +18295,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
             runTest("compiler/testData/codegen/box/fakeOverride/propertySetter.kt");
         }
 
+        @Test
+        @TestMetadata("substitutionInLocal.kt")
+        public void testSubstitutionInLocal() throws Exception {
+            runTest("compiler/testData/codegen/box/fakeOverride/substitutionInLocal.kt");
+        }
+
         @Test
         @TestMetadata("varianceOverload.kt")
         public void testVarianceOverload() throws Exception {
@@ -33887,6 +33899,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt");
                 }
 
+                @Test
+                @TestMetadata("intersectionOverrideWithDefaultParameterInCommonModule.kt")
+                public void testIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt");
+                }
+
                 @Test
                 @TestMetadata("kt-51753-1.kt")
                 public void testKt_51753_1() throws Exception {
@@ -33911,6 +33929,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt");
                 }
 
+                @Test
+                @TestMetadata("localIntersectionOverrideWithDefaultParameterInCommonModule.kt")
+                public void testLocalIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt");
+                }
+
                 @Test
                 @TestMetadata("localSubstitutionOverrideInCommonModule.kt")
                 public void testLocalSubstitutionOverrideInCommonModule() throws Exception {
diff --git a/compiler/testData/codegen/box/fakeOverride/intersectionInLocal.kt b/compiler/testData/codegen/box/fakeOverride/intersectionInLocal.kt
new file mode 100644
index 00000000000..66b132a8fa2
--- /dev/null
+++ b/compiler/testData/codegen/box/fakeOverride/intersectionInLocal.kt
@@ -0,0 +1,27 @@
+// MODULE: lib
+// FILE: l.kt
+
+open class LightParam : LightVariab(), PsiParam { // i/o public String getName
+}
+
+open class LightVariab {
+    fun name(): String? = "O"
+    val name2: String? get() = "K"
+}
+
+interface PsiParam {
+    fun name(): String?
+    val name2: String?
+}
+
+// MODULE: main(lib)
+// FILE: m.kt
+
+fun box(): String {
+    return object : LightParam() {
+        fun getText() = name() + name2
+    }.getText()
+}
+
+
+
diff --git a/compiler/testData/codegen/box/fakeOverride/substitutionInLocal.kt b/compiler/testData/codegen/box/fakeOverride/substitutionInLocal.kt
new file mode 100644
index 00000000000..bd317b97590
--- /dev/null
+++ b/compiler/testData/codegen/box/fakeOverride/substitutionInLocal.kt
@@ -0,0 +1,22 @@
+// MODULE: lib
+// FILE: l.kt
+
+open class LightParam : LightVariab<Unit>() { // i/o public String getName
+}
+
+open class LightVariab<W> {
+    fun W.name(): String? = "O"
+    val W.name2: String? get() = "K"
+}
+
+// MODULE: main(lib)
+// FILE: m.kt
+
+fun box(): String {
+    return object : LightParam() {
+        fun getText() = Unit.name() + Unit.name2
+    }.getText()
+}
+
+
+
diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt
new file mode 100644
index 00000000000..6e04a72d29c
--- /dev/null
+++ b/compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt
@@ -0,0 +1,42 @@
+// LANGUAGE: +MultiPlatformProjects
+// IGNORE_BACKEND_K1: ANY
+// ISSUE: KT-60850
+// WITH_STDLIB
+
+// MODULE: common
+// FILE: common.kt
+
+expect class Expect {
+    fun foo(): String
+}
+
+interface Base {
+    fun cancel(s: Expect? = null): String
+}
+
+open class Derived : Base {
+    override fun cancel(s: Expect?): String {
+        return s?.foo() ?: "OK"
+    }
+}
+
+open class AbstractImpl : Derived(), Base
+
+// MODULE: platform()()(common)
+// FILE: platform.kt
+
+class ActualTarget {
+    fun foo(): String = "Fail"
+}
+
+actual typealias Expect = ActualTarget
+
+class Impl : AbstractImpl() {
+    fun test(): String {
+        return cancel()
+    }
+}
+
+fun box(): String {
+    return Impl().test()
+}
diff --git a/compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt b/compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt
new file mode 100644
index 00000000000..3b80af470c1
--- /dev/null
+++ b/compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt
@@ -0,0 +1,55 @@
+// LANGUAGE: +MultiPlatformProjects
+// IGNORE_BACKEND_K1: ANY
+// ISSUE: KT-60850
+// WITH_STDLIB
+
+// MODULE: common
+// FILE: common.kt
+
+expect class Expect {
+    fun foo(): String
+}
+
+interface Base {
+    fun cancel(s: Expect? = null): String
+}
+
+open class Derived : Base {
+    override fun cancel(s: Expect?): String {
+        return s?.foo() ?: "OK"
+    }
+}
+
+open class AbstractImpl : Derived(), Base
+
+fun testCommon(): String {
+    class LocalCommon : AbstractImpl() {
+        fun test(): String {
+            return cancel()
+        }
+    }
+    return LocalCommon().test()
+}
+
+// MODULE: platform()()(common)
+// FILE: platform.kt
+
+class ActualTarget {
+    fun foo(): String = "Fail"
+}
+
+fun testPlatform(): String {
+    class LocalPlatform : AbstractImpl() {
+        fun test(): String {
+            return cancel()
+        }
+    }
+    return LocalPlatform().test()
+}
+
+actual typealias Expect = ActualTarget
+
+fun box(): String {
+    if (testCommon() != "OK") return "Fail"
+    return testPlatform()
+}
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
index 2dcf23052f0..4061af3a57c 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
@@ -17491,6 +17491,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/fakeOverride/internalFromFriendModule.kt");
         }
 
+        @Test
+        @TestMetadata("intersectionInLocal.kt")
+        public void testIntersectionInLocal() throws Exception {
+            runTest("compiler/testData/codegen/box/fakeOverride/intersectionInLocal.kt");
+        }
+
         @Test
         @TestMetadata("kt49371.kt")
         public void testKt49371() throws Exception {
@@ -17521,6 +17527,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             runTest("compiler/testData/codegen/box/fakeOverride/propertySetter.kt");
         }
 
+        @Test
+        @TestMetadata("substitutionInLocal.kt")
+        public void testSubstitutionInLocal() throws Exception {
+            runTest("compiler/testData/codegen/box/fakeOverride/substitutionInLocal.kt");
+        }
+
         @Test
         @TestMetadata("varianceOverload.kt")
         public void testVarianceOverload() throws Exception {
@@ -32231,6 +32243,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt");
                 }
 
+                @Test
+                @TestMetadata("intersectionOverrideWithDefaultParameterInCommonModule.kt")
+                public void testIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt");
+                }
+
                 @Test
                 @TestMetadata("kt-56329.kt")
                 public void testKt_56329() throws Exception {
@@ -32243,6 +32261,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt");
                 }
 
+                @Test
+                @TestMetadata("localIntersectionOverrideWithDefaultParameterInCommonModule.kt")
+                public void testLocalIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt");
+                }
+
                 @Test
                 @TestMetadata("localSubstitutionOverrideInCommonModule.kt")
                 public void testLocalSubstitutionOverrideInCommonModule() throws Exception {
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
index efe0c66d0df..90b412f8fd5 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
@@ -18259,6 +18259,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/fakeOverride/internalFromFriendModule.kt");
         }
 
+        @Test
+        @TestMetadata("intersectionInLocal.kt")
+        public void testIntersectionInLocal() throws Exception {
+            runTest("compiler/testData/codegen/box/fakeOverride/intersectionInLocal.kt");
+        }
+
         @Test
         @TestMetadata("kt49371.kt")
         public void testKt49371() throws Exception {
@@ -18289,6 +18295,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             runTest("compiler/testData/codegen/box/fakeOverride/propertySetter.kt");
         }
 
+        @Test
+        @TestMetadata("substitutionInLocal.kt")
+        public void testSubstitutionInLocal() throws Exception {
+            runTest("compiler/testData/codegen/box/fakeOverride/substitutionInLocal.kt");
+        }
+
         @Test
         @TestMetadata("varianceOverload.kt")
         public void testVarianceOverload() throws Exception {
@@ -33887,6 +33899,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt");
                 }
 
+                @Test
+                @TestMetadata("intersectionOverrideWithDefaultParameterInCommonModule.kt")
+                public void testIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt");
+                }
+
                 @Test
                 @TestMetadata("kt-51753-1.kt")
                 public void testKt_51753_1() throws Exception {
@@ -33911,6 +33929,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt");
                 }
 
+                @Test
+                @TestMetadata("localIntersectionOverrideWithDefaultParameterInCommonModule.kt")
+                public void testLocalIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt");
+                }
+
                 @Test
                 @TestMetadata("localSubstitutionOverrideInCommonModule.kt")
                 public void testLocalSubstitutionOverrideInCommonModule() throws Exception {
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java
index 8aa5863e8bc..a061f8e0d34 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java
@@ -18259,6 +18259,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
             runTest("compiler/testData/codegen/box/fakeOverride/internalFromFriendModule.kt");
         }
 
+        @Test
+        @TestMetadata("intersectionInLocal.kt")
+        public void testIntersectionInLocal() throws Exception {
+            runTest("compiler/testData/codegen/box/fakeOverride/intersectionInLocal.kt");
+        }
+
         @Test
         @TestMetadata("kt49371.kt")
         public void testKt49371() throws Exception {
@@ -18289,6 +18295,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
             runTest("compiler/testData/codegen/box/fakeOverride/propertySetter.kt");
         }
 
+        @Test
+        @TestMetadata("substitutionInLocal.kt")
+        public void testSubstitutionInLocal() throws Exception {
+            runTest("compiler/testData/codegen/box/fakeOverride/substitutionInLocal.kt");
+        }
+
         @Test
         @TestMetadata("varianceOverload.kt")
         public void testVarianceOverload() throws Exception {
@@ -33887,6 +33899,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt");
                 }
 
+                @Test
+                @TestMetadata("intersectionOverrideWithDefaultParameterInCommonModule.kt")
+                public void testIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt");
+                }
+
                 @Test
                 @TestMetadata("kt-51753-1.kt")
                 public void testKt_51753_1() throws Exception {
@@ -33911,6 +33929,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt");
                 }
 
+                @Test
+                @TestMetadata("localIntersectionOverrideWithDefaultParameterInCommonModule.kt")
+                public void testLocalIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt");
+                }
+
                 @Test
                 @TestMetadata("localSubstitutionOverrideInCommonModule.kt")
                 public void testLocalSubstitutionOverrideInCommonModule() throws Exception {
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
index d2719b044a1..948cc31f63f 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
+++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
@@ -15161,6 +15161,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/fakeOverride/internalFromFriendModule.kt");
         }
 
+        @TestMetadata("intersectionInLocal.kt")
+        public void testIntersectionInLocal() throws Exception {
+            runTest("compiler/testData/codegen/box/fakeOverride/intersectionInLocal.kt");
+        }
+
         @TestMetadata("kt49371.kt")
         public void testKt49371() throws Exception {
             runTest("compiler/testData/codegen/box/fakeOverride/kt49371.kt");
@@ -15186,6 +15191,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/fakeOverride/propertySetter.kt");
         }
 
+        @TestMetadata("substitutionInLocal.kt")
+        public void testSubstitutionInLocal() throws Exception {
+            runTest("compiler/testData/codegen/box/fakeOverride/substitutionInLocal.kt");
+        }
+
         @TestMetadata("varianceOverload.kt")
         public void testVarianceOverload() throws Exception {
             runTest("compiler/testData/codegen/box/fakeOverride/varianceOverload.kt");
@@ -28895,6 +28905,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt");
                 }
 
+                @TestMetadata("intersectionOverrideWithDefaultParameterInCommonModule.kt")
+                public void testIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt");
+                }
+
                 @TestMetadata("kt-51753-1.kt")
                 public void testKt_51753_1() throws Exception {
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/kt-51753-1.kt");
@@ -28915,6 +28930,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt");
                 }
 
+                @TestMetadata("localIntersectionOverrideWithDefaultParameterInCommonModule.kt")
+                public void testLocalIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt");
+                }
+
                 @TestMetadata("localSubstitutionOverrideInCommonModule.kt")
                 public void testLocalSubstitutionOverrideInCommonModule() throws Exception {
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localSubstitutionOverrideInCommonModule.kt");
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java
index ff40cd62682..f9be919b276 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java
@@ -13543,6 +13543,12 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/fakeOverride/internalFromFriendModule.kt");
         }
 
+        @Test
+        @TestMetadata("intersectionInLocal.kt")
+        public void testIntersectionInLocal() throws Exception {
+            runTest("compiler/testData/codegen/box/fakeOverride/intersectionInLocal.kt");
+        }
+
         @Test
         @TestMetadata("kt49371.kt")
         public void testKt49371() throws Exception {
@@ -13573,6 +13579,12 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/fakeOverride/propertySetter.kt");
         }
 
+        @Test
+        @TestMetadata("substitutionInLocal.kt")
+        public void testSubstitutionInLocal() throws Exception {
+            runTest("compiler/testData/codegen/box/fakeOverride/substitutionInLocal.kt");
+        }
+
         @Test
         @TestMetadata("varianceOverload.kt")
         public void testVarianceOverload() throws Exception {
@@ -23687,6 +23699,12 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest {
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt");
                 }
 
+                @Test
+                @TestMetadata("intersectionOverrideWithDefaultParameterInCommonModule.kt")
+                public void testIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt");
+                }
+
                 @Test
                 @TestMetadata("kt-56329.kt")
                 public void testKt_56329() throws Exception {
@@ -23699,6 +23717,12 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest {
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt");
                 }
 
+                @Test
+                @TestMetadata("localIntersectionOverrideWithDefaultParameterInCommonModule.kt")
+                public void testLocalIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt");
+                }
+
                 @Test
                 @TestMetadata("localSubstitutionOverrideInCommonModule.kt")
                 public void testLocalSubstitutionOverrideInCommonModule() throws Exception {
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java
index 7f30d7a3d91..78a1672ca5c 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6CodegenBoxTestGenerated.java
@@ -13543,6 +13543,12 @@ public class FirJsES6CodegenBoxTestGenerated extends AbstractFirJsES6CodegenBoxT
             runTest("compiler/testData/codegen/box/fakeOverride/internalFromFriendModule.kt");
         }
 
+        @Test
+        @TestMetadata("intersectionInLocal.kt")
+        public void testIntersectionInLocal() throws Exception {
+            runTest("compiler/testData/codegen/box/fakeOverride/intersectionInLocal.kt");
+        }
+
         @Test
         @TestMetadata("kt49371.kt")
         public void testKt49371() throws Exception {
@@ -13573,6 +13579,12 @@ public class FirJsES6CodegenBoxTestGenerated extends AbstractFirJsES6CodegenBoxT
             runTest("compiler/testData/codegen/box/fakeOverride/propertySetter.kt");
         }
 
+        @Test
+        @TestMetadata("substitutionInLocal.kt")
+        public void testSubstitutionInLocal() throws Exception {
+            runTest("compiler/testData/codegen/box/fakeOverride/substitutionInLocal.kt");
+        }
+
         @Test
         @TestMetadata("varianceOverload.kt")
         public void testVarianceOverload() throws Exception {
@@ -23687,6 +23699,12 @@ public class FirJsES6CodegenBoxTestGenerated extends AbstractFirJsES6CodegenBoxT
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt");
                 }
 
+                @Test
+                @TestMetadata("intersectionOverrideWithDefaultParameterInCommonModule.kt")
+                public void testIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt");
+                }
+
                 @Test
                 @TestMetadata("kt-56329.kt")
                 public void testKt_56329() throws Exception {
@@ -23699,6 +23717,12 @@ public class FirJsES6CodegenBoxTestGenerated extends AbstractFirJsES6CodegenBoxT
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt");
                 }
 
+                @Test
+                @TestMetadata("localIntersectionOverrideWithDefaultParameterInCommonModule.kt")
+                public void testLocalIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt");
+                }
+
                 @Test
                 @TestMetadata("localSubstitutionOverrideInCommonModule.kt")
                 public void testLocalSubstitutionOverrideInCommonModule() throws Exception {
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
index 2494b143f4c..36e6fb8f70e 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
@@ -13543,6 +13543,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/fakeOverride/internalFromFriendModule.kt");
         }
 
+        @Test
+        @TestMetadata("intersectionInLocal.kt")
+        public void testIntersectionInLocal() throws Exception {
+            runTest("compiler/testData/codegen/box/fakeOverride/intersectionInLocal.kt");
+        }
+
         @Test
         @TestMetadata("kt49371.kt")
         public void testKt49371() throws Exception {
@@ -13573,6 +13579,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
             runTest("compiler/testData/codegen/box/fakeOverride/propertySetter.kt");
         }
 
+        @Test
+        @TestMetadata("substitutionInLocal.kt")
+        public void testSubstitutionInLocal() throws Exception {
+            runTest("compiler/testData/codegen/box/fakeOverride/substitutionInLocal.kt");
+        }
+
         @Test
         @TestMetadata("varianceOverload.kt")
         public void testVarianceOverload() throws Exception {
@@ -23687,6 +23699,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt");
                 }
 
+                @Test
+                @TestMetadata("intersectionOverrideWithDefaultParameterInCommonModule.kt")
+                public void testIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt");
+                }
+
                 @Test
                 @TestMetadata("kt-56329.kt")
                 public void testKt_56329() throws Exception {
@@ -23699,6 +23717,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt");
                 }
 
+                @Test
+                @TestMetadata("localIntersectionOverrideWithDefaultParameterInCommonModule.kt")
+                public void testLocalIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt");
+                }
+
                 @Test
                 @TestMetadata("localSubstitutionOverrideInCommonModule.kt")
                 public void testLocalSubstitutionOverrideInCommonModule() throws Exception {
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java
index 5ab9db6793a..0a3d1ad9311 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java
@@ -13543,6 +13543,12 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes
             runTest("compiler/testData/codegen/box/fakeOverride/internalFromFriendModule.kt");
         }
 
+        @Test
+        @TestMetadata("intersectionInLocal.kt")
+        public void testIntersectionInLocal() throws Exception {
+            runTest("compiler/testData/codegen/box/fakeOverride/intersectionInLocal.kt");
+        }
+
         @Test
         @TestMetadata("kt49371.kt")
         public void testKt49371() throws Exception {
@@ -13573,6 +13579,12 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes
             runTest("compiler/testData/codegen/box/fakeOverride/propertySetter.kt");
         }
 
+        @Test
+        @TestMetadata("substitutionInLocal.kt")
+        public void testSubstitutionInLocal() throws Exception {
+            runTest("compiler/testData/codegen/box/fakeOverride/substitutionInLocal.kt");
+        }
+
         @Test
         @TestMetadata("varianceOverload.kt")
         public void testVarianceOverload() throws Exception {
@@ -23687,6 +23699,12 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt");
                 }
 
+                @Test
+                @TestMetadata("intersectionOverrideWithDefaultParameterInCommonModule.kt")
+                public void testIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt");
+                }
+
                 @Test
                 @TestMetadata("kt-56329.kt")
                 public void testKt_56329() throws Exception {
@@ -23699,6 +23717,12 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt");
                 }
 
+                @Test
+                @TestMetadata("localIntersectionOverrideWithDefaultParameterInCommonModule.kt")
+                public void testLocalIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt");
+                }
+
                 @Test
                 @TestMetadata("localSubstitutionOverrideInCommonModule.kt")
                 public void testLocalSubstitutionOverrideInCommonModule() throws Exception {
diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java
index 7fc2b9aad28..228c0a2bb0c 100644
--- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java
+++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java
@@ -14655,6 +14655,12 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe
                 runTest("compiler/testData/codegen/box/fakeOverride/internalFromFriendModule.kt");
             }
 
+            @Test
+            @TestMetadata("intersectionInLocal.kt")
+            public void testIntersectionInLocal() throws Exception {
+                runTest("compiler/testData/codegen/box/fakeOverride/intersectionInLocal.kt");
+            }
+
             @Test
             @TestMetadata("kt49371.kt")
             public void testKt49371() throws Exception {
@@ -14685,6 +14691,12 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe
                 runTest("compiler/testData/codegen/box/fakeOverride/propertySetter.kt");
             }
 
+            @Test
+            @TestMetadata("substitutionInLocal.kt")
+            public void testSubstitutionInLocal() throws Exception {
+                runTest("compiler/testData/codegen/box/fakeOverride/substitutionInLocal.kt");
+            }
+
             @Test
             @TestMetadata("varianceOverload.kt")
             public void testVarianceOverload() throws Exception {
@@ -26662,6 +26674,12 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe
                         runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt");
                     }
 
+                    @Test
+                    @TestMetadata("intersectionOverrideWithDefaultParameterInCommonModule.kt")
+                    public void testIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                        runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt");
+                    }
+
                     @Test
                     @TestMetadata("kt-56329.kt")
                     public void testKt_56329() throws Exception {
@@ -26674,6 +26692,12 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe
                         runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt");
                     }
 
+                    @Test
+                    @TestMetadata("localIntersectionOverrideWithDefaultParameterInCommonModule.kt")
+                    public void testLocalIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                        runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt");
+                    }
+
                     @Test
                     @TestMetadata("localSubstitutionOverrideInCommonModule.kt")
                     public void testLocalSubstitutionOverrideInCommonModule() throws Exception {
diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java
index 6a149fd9b1e..144eb89af6a 100644
--- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java
+++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java
@@ -15007,6 +15007,12 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB
                 runTest("compiler/testData/codegen/box/fakeOverride/internalFromFriendModule.kt");
             }
 
+            @Test
+            @TestMetadata("intersectionInLocal.kt")
+            public void testIntersectionInLocal() throws Exception {
+                runTest("compiler/testData/codegen/box/fakeOverride/intersectionInLocal.kt");
+            }
+
             @Test
             @TestMetadata("kt49371.kt")
             public void testKt49371() throws Exception {
@@ -15037,6 +15043,12 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB
                 runTest("compiler/testData/codegen/box/fakeOverride/propertySetter.kt");
             }
 
+            @Test
+            @TestMetadata("substitutionInLocal.kt")
+            public void testSubstitutionInLocal() throws Exception {
+                runTest("compiler/testData/codegen/box/fakeOverride/substitutionInLocal.kt");
+            }
+
             @Test
             @TestMetadata("varianceOverload.kt")
             public void testVarianceOverload() throws Exception {
@@ -27278,6 +27290,12 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB
                         runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt");
                     }
 
+                    @Test
+                    @TestMetadata("intersectionOverrideWithDefaultParameterInCommonModule.kt")
+                    public void testIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                        runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt");
+                    }
+
                     @Test
                     @TestMetadata("kt-56329.kt")
                     public void testKt_56329() throws Exception {
@@ -27290,6 +27308,12 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB
                         runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt");
                     }
 
+                    @Test
+                    @TestMetadata("localIntersectionOverrideWithDefaultParameterInCommonModule.kt")
+                    public void testLocalIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                        runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt");
+                    }
+
                     @Test
                     @TestMetadata("localSubstitutionOverrideInCommonModule.kt")
                     public void testLocalSubstitutionOverrideInCommonModule() throws Exception {
diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java
index 3502201ca15..e2c09596fd3 100644
--- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java
+++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java
@@ -14480,6 +14480,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
                 runTest("compiler/testData/codegen/box/fakeOverride/internalFromFriendModule.kt");
             }
 
+            @Test
+            @TestMetadata("intersectionInLocal.kt")
+            public void testIntersectionInLocal() throws Exception {
+                runTest("compiler/testData/codegen/box/fakeOverride/intersectionInLocal.kt");
+            }
+
             @Test
             @TestMetadata("kt49371.kt")
             public void testKt49371() throws Exception {
@@ -14510,6 +14516,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
                 runTest("compiler/testData/codegen/box/fakeOverride/propertySetter.kt");
             }
 
+            @Test
+            @TestMetadata("substitutionInLocal.kt")
+            public void testSubstitutionInLocal() throws Exception {
+                runTest("compiler/testData/codegen/box/fakeOverride/substitutionInLocal.kt");
+            }
+
             @Test
             @TestMetadata("varianceOverload.kt")
             public void testVarianceOverload() throws Exception {
@@ -26355,6 +26367,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
                         runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt");
                     }
 
+                    @Test
+                    @TestMetadata("intersectionOverrideWithDefaultParameterInCommonModule.kt")
+                    public void testIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                        runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt");
+                    }
+
                     @Test
                     @TestMetadata("kt-56329.kt")
                     public void testKt_56329() throws Exception {
@@ -26367,6 +26385,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
                         runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt");
                     }
 
+                    @Test
+                    @TestMetadata("localIntersectionOverrideWithDefaultParameterInCommonModule.kt")
+                    public void testLocalIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                        runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt");
+                    }
+
                     @Test
                     @TestMetadata("localSubstitutionOverrideInCommonModule.kt")
                     public void testLocalSubstitutionOverrideInCommonModule() throws Exception {
diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java
index 18cb8ccbc40..27c565bab37 100644
--- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java
+++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java
@@ -14656,6 +14656,12 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT
                 runTest("compiler/testData/codegen/box/fakeOverride/internalFromFriendModule.kt");
             }
 
+            @Test
+            @TestMetadata("intersectionInLocal.kt")
+            public void testIntersectionInLocal() throws Exception {
+                runTest("compiler/testData/codegen/box/fakeOverride/intersectionInLocal.kt");
+            }
+
             @Test
             @TestMetadata("kt49371.kt")
             public void testKt49371() throws Exception {
@@ -14686,6 +14692,12 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT
                 runTest("compiler/testData/codegen/box/fakeOverride/propertySetter.kt");
             }
 
+            @Test
+            @TestMetadata("substitutionInLocal.kt")
+            public void testSubstitutionInLocal() throws Exception {
+                runTest("compiler/testData/codegen/box/fakeOverride/substitutionInLocal.kt");
+            }
+
             @Test
             @TestMetadata("varianceOverload.kt")
             public void testVarianceOverload() throws Exception {
@@ -26663,6 +26675,12 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT
                         runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt");
                     }
 
+                    @Test
+                    @TestMetadata("intersectionOverrideWithDefaultParameterInCommonModule.kt")
+                    public void testIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                        runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt");
+                    }
+
                     @Test
                     @TestMetadata("kt-56329.kt")
                     public void testKt_56329() throws Exception {
@@ -26675,6 +26693,12 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT
                         runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt");
                     }
 
+                    @Test
+                    @TestMetadata("localIntersectionOverrideWithDefaultParameterInCommonModule.kt")
+                    public void testLocalIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                        runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt");
+                    }
+
                     @Test
                     @TestMetadata("localSubstitutionOverrideInCommonModule.kt")
                     public void testLocalSubstitutionOverrideInCommonModule() throws Exception {
diff --git a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmCodegenBoxTestGenerated.java b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmCodegenBoxTestGenerated.java
index 92b9dc9d4a6..514c7a291b8 100644
--- a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmCodegenBoxTestGenerated.java
+++ b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/FirWasmCodegenBoxTestGenerated.java
@@ -13519,6 +13519,12 @@ public class FirWasmCodegenBoxTestGenerated extends AbstractFirWasmCodegenBoxTes
             runTest("compiler/testData/codegen/box/fakeOverride/internalFromFriendModule.kt");
         }
 
+        @Test
+        @TestMetadata("intersectionInLocal.kt")
+        public void testIntersectionInLocal() throws Exception {
+            runTest("compiler/testData/codegen/box/fakeOverride/intersectionInLocal.kt");
+        }
+
         @Test
         @TestMetadata("kt49371.kt")
         public void testKt49371() throws Exception {
@@ -13549,6 +13555,12 @@ public class FirWasmCodegenBoxTestGenerated extends AbstractFirWasmCodegenBoxTes
             runTest("compiler/testData/codegen/box/fakeOverride/propertySetter.kt");
         }
 
+        @Test
+        @TestMetadata("substitutionInLocal.kt")
+        public void testSubstitutionInLocal() throws Exception {
+            runTest("compiler/testData/codegen/box/fakeOverride/substitutionInLocal.kt");
+        }
+
         @Test
         @TestMetadata("varianceOverload.kt")
         public void testVarianceOverload() throws Exception {
@@ -23435,6 +23447,12 @@ public class FirWasmCodegenBoxTestGenerated extends AbstractFirWasmCodegenBoxTes
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt");
                 }
 
+                @Test
+                @TestMetadata("intersectionOverrideWithDefaultParameterInCommonModule.kt")
+                public void testIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt");
+                }
+
                 @Test
                 @TestMetadata("kt-56329.kt")
                 public void testKt_56329() throws Exception {
@@ -23447,6 +23465,12 @@ public class FirWasmCodegenBoxTestGenerated extends AbstractFirWasmCodegenBoxTes
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt");
                 }
 
+                @Test
+                @TestMetadata("localIntersectionOverrideWithDefaultParameterInCommonModule.kt")
+                public void testLocalIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt");
+                }
+
                 @Test
                 @TestMetadata("localSubstitutionOverrideInCommonModule.kt")
                 public void testLocalSubstitutionOverrideInCommonModule() throws Exception {
diff --git a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java
index 2847477986d..05b4fb1867d 100644
--- a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java
+++ b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/K1WasmCodegenBoxTestGenerated.java
@@ -13519,6 +13519,12 @@ public class K1WasmCodegenBoxTestGenerated extends AbstractK1WasmCodegenBoxTest
             runTest("compiler/testData/codegen/box/fakeOverride/internalFromFriendModule.kt");
         }
 
+        @Test
+        @TestMetadata("intersectionInLocal.kt")
+        public void testIntersectionInLocal() throws Exception {
+            runTest("compiler/testData/codegen/box/fakeOverride/intersectionInLocal.kt");
+        }
+
         @Test
         @TestMetadata("kt49371.kt")
         public void testKt49371() throws Exception {
@@ -13549,6 +13555,12 @@ public class K1WasmCodegenBoxTestGenerated extends AbstractK1WasmCodegenBoxTest
             runTest("compiler/testData/codegen/box/fakeOverride/propertySetter.kt");
         }
 
+        @Test
+        @TestMetadata("substitutionInLocal.kt")
+        public void testSubstitutionInLocal() throws Exception {
+            runTest("compiler/testData/codegen/box/fakeOverride/substitutionInLocal.kt");
+        }
+
         @Test
         @TestMetadata("varianceOverload.kt")
         public void testVarianceOverload() throws Exception {
@@ -23435,6 +23447,12 @@ public class K1WasmCodegenBoxTestGenerated extends AbstractK1WasmCodegenBoxTest
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt");
                 }
 
+                @Test
+                @TestMetadata("intersectionOverrideWithDefaultParameterInCommonModule.kt")
+                public void testIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt");
+                }
+
                 @Test
                 @TestMetadata("kt-56329.kt")
                 public void testKt_56329() throws Exception {
@@ -23447,6 +23465,12 @@ public class K1WasmCodegenBoxTestGenerated extends AbstractK1WasmCodegenBoxTest
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt");
                 }
 
+                @Test
+                @TestMetadata("localIntersectionOverrideWithDefaultParameterInCommonModule.kt")
+                public void testLocalIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt");
+                }
+
                 @Test
                 @TestMetadata("localSubstitutionOverrideInCommonModule.kt")
                 public void testLocalSubstitutionOverrideInCommonModule() throws Exception {