diff --git a/compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/java/AbstractFirTypeEnhancementTest.kt b/compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/java/AbstractFirTypeEnhancementTest.kt
index 3cda3c54ff5..1a537c3ec79 100644
--- a/compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/java/AbstractFirTypeEnhancementTest.kt
+++ b/compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/java/AbstractFirTypeEnhancementTest.kt
@@ -145,26 +145,24 @@ abstract class AbstractFirTypeEnhancementTest : KtUsefulTestCase() {
             val symbolProvider = session.symbolProvider as FirCompositeSymbolProvider
             val javaProvider = symbolProvider.providers.filterIsInstance<JavaSymbolProvider>().first()
 
-            val topLevelJavaClasses = topPsiClasses.map { it.classId(FqName.ROOT) }
-
+            val processedJavaClasses = mutableSetOf<FirJavaClass>()
             fun processClassWithChildren(psiClass: PsiClass, parentFqName: FqName) {
                 val classId = psiClass.classId(parentFqName)
-                javaProvider.getClassLikeSymbolByFqName(classId)
+                val javaClass = javaProvider.getClassLikeSymbolByFqName(classId)?.fir
                     ?: throw AssertionError(classId.asString())
-                psiClass.innerClasses.forEach {
-                    processClassWithChildren(psiClass = it, parentFqName = classId.relativeClassName)
+                if (javaClass !is FirJavaClass || javaClass in processedJavaClasses) {
+                    return
                 }
-            }
-            for (psiClass in topPsiClasses) {
-                processClassWithChildren(psiClass, FqName.ROOT)
-            }
-
-            val processedJavaClasses = mutableSetOf<FirJavaClass>()
-            for (javaClassId in topLevelJavaClasses.sortedBy { it.shortClassName }) {
-                val javaClass = javaProvider.getClassLikeSymbolByFqName(javaClassId)?.fir ?: continue
-                if (javaClass !is FirJavaClass || javaClass in processedJavaClasses) continue
-                renderJavaClass(renderer, javaClass, session)
                 processedJavaClasses += javaClass
+                renderJavaClass(renderer, javaClass, session) {
+                    for (innerClass in psiClass.innerClasses.sortedBy { it.name }) {
+                        processClassWithChildren(innerClass, classId.relativeClassName)
+                    }
+                }
+
+            }
+            for (psiClass in topPsiClasses.sortedBy { it.name }) {
+                processClassWithChildren(psiClass, FqName.ROOT)
             }
         }.toString()
 
diff --git a/compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/java/JavaClassRendering.kt b/compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/java/JavaClassRendering.kt
index 5998b492959..fc0c4dbf548 100644
--- a/compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/java/JavaClassRendering.kt
+++ b/compiler/fir/analysis-tests/legacy-fir-tests/tests/org/jetbrains/kotlin/fir/java/JavaClassRendering.kt
@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.symbols.SymbolInternals
 import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
 
 @OptIn(SymbolInternals::class)
-fun renderJavaClass(renderer: FirRenderer, javaClass: FirJavaClass, session: FirSession) {
+fun renderJavaClass(renderer: FirRenderer, javaClass: FirJavaClass, session: FirSession, renderInnerClasses: () -> Unit) {
     val memberScope = javaClass.unsubstitutedScope(session, ScopeSession(), withForcedTypeCalculator = true)
 
     val staticScope = javaClass.scopeProvider.getStaticScope(javaClass, session, ScopeSession())
@@ -61,5 +61,7 @@ fun renderJavaClass(renderer: FirRenderer, javaClass: FirJavaClass, session: Fir
                 }
             }
         }
+
+        renderInnerClasses()
     }
 }
diff --git a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt
index 5bb2946eb04..0487ac00836 100644
--- a/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt
+++ b/compiler/fir/analysis-tests/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt
@@ -11,6 +11,34 @@
 
     public constructor(): R|A|
 
+    @R|NullableApi|() public open inner class B : R|kotlin/Any| {
+        public open field field: R|kotlin/String?|
+
+        public open fun foo(x: R|kotlin/String?|, @R|javax/annotation/Nonnull|() y: R|@EnhancedNullability kotlin/CharSequence|): R|kotlin/String?|
+
+        @R|NonNullApi|() public open fun foobar(x: R|@EnhancedNullability kotlin/String|, @R|NullableApi|() y: R|kotlin/CharSequence?|): R|@EnhancedNullability kotlin/String|
+
+        public open fun bar(): R|kotlin/String?|
+
+        @R|javax/annotation/Nullable|() public open fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+
+        public constructor(): R|A.B|
+
+    }
+    @R|FieldsAreNullable|() public open inner class C : R|kotlin/Any| {
+        public open field field: R|kotlin/String?|
+
+        public open fun foo(x: R|ft<kotlin/String, kotlin/String?>|, @R|javax/annotation/Nullable|() y: R|kotlin/CharSequence?|): R|ft<kotlin/String, kotlin/String?>|
+
+        @R|NullableApi|() public open fun foobar(x: R|kotlin/String?|, @R|javax/annotation/Nullable|() y: R|kotlin/CharSequence?|): R|kotlin/String?|
+
+        public open fun bar(): R|ft<kotlin/String, kotlin/String?>|
+
+        @R|javax/annotation/Nullable|() public open fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+
+        public constructor(): R|A.C|
+
+    }
 }
 @R|kotlin/annotation/Retention|(R|kotlin/annotation/AnnotationRetention.RUNTIME|()) @R|kotlin/annotation/MustBeDocumented|() @R|javax/annotation/CheckForNull|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.FIELD|())) public final annotation class FieldsAreNullable : R|kotlin/Annotation| {
     public constructor(): R|FieldsAreNullable|
diff --git a/compiler/testData/loadJava/compiledJava/ArrayInGenericArguments.fir.txt b/compiler/testData/loadJava/compiledJava/ArrayInGenericArguments.fir.txt
index 61123e1cb3e..2ae5891b1ca 100644
--- a/compiler/testData/loadJava/compiledJava/ArrayInGenericArguments.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ArrayInGenericArguments.fir.txt
@@ -7,4 +7,8 @@ public open class ArrayInGenericArguments : R|kotlin/Any| {
 
     public constructor(): R|ArrayInGenericArguments|
 
+    public open class DataKey<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public constructor<T : R|ft<kotlin/Any, kotlin/Any?>|>(): R|ArrayInGenericArguments.DataKey<T>|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypes.fir.txt b/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypes.fir.txt
index 98fff664f4f..868c0d1bd50 100644
--- a/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypes.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypes.fir.txt
@@ -1,4 +1,18 @@
 public final class InheritMethodsDifferentReturnTypes : R|kotlin/Any| {
     public constructor(): R|test/InheritMethodsDifferentReturnTypes|
 
+    public abstract interface Sub : R|test/InheritMethodsDifferentReturnTypes.Super1|, R|test/InheritMethodsDifferentReturnTypes.Super2| {
+    }
+    public abstract interface Super1 : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<kotlin/CharSequence, kotlin/CharSequence?>|
+
+        public abstract fun bar(): R|ft<kotlin/String, kotlin/String?>|
+
+    }
+    public abstract interface Super2 : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<kotlin/String, kotlin/String?>|
+
+        public abstract fun bar(): R|ft<kotlin/CharSequence, kotlin/CharSequence?>|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.fir.txt b/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.fir.txt
index ebadbf34b07..2eb1fcee88f 100644
--- a/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.fir.txt
@@ -1,4 +1,18 @@
 public final class InheritMethodsDifferentReturnTypesGeneric : R|kotlin/Any| {
     public constructor(): R|test/InheritMethodsDifferentReturnTypesGeneric|
 
+    public abstract interface Sub : R|test/InheritMethodsDifferentReturnTypesGeneric.Super1<ft<kotlin/String, kotlin/String?>, ft<kotlin/CharSequence, kotlin/CharSequence?>>|, R|test/InheritMethodsDifferentReturnTypesGeneric.Super2<ft<kotlin/CharSequence, kotlin/CharSequence?>, ft<kotlin/String, kotlin/String?>>| {
+    }
+    public abstract interface Super1<F : R|ft<kotlin/Any, kotlin/Any?>|, B : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<F, F?>|
+
+        public abstract fun bar(): R|ft<B, B?>|
+
+    }
+    public abstract interface Super2<FF : R|ft<kotlin/Any, kotlin/Any?>|, BB : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<FF, FF?>|
+
+        public abstract fun bar(): R|ft<BB, BB?>|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/InnerClass.fir.txt b/compiler/testData/loadJava/compiledJava/InnerClass.fir.txt
index 20600fe93b8..af715732a90 100644
--- a/compiler/testData/loadJava/compiledJava/InnerClass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/InnerClass.fir.txt
@@ -1,4 +1,8 @@
 public open class InnerClass : R|kotlin/Any| {
     public constructor(): R|test/InnerClass|
 
+    public open inner class Inner : R|kotlin/Any| {
+        public constructor(): R|test/InnerClass.Inner|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt b/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt
index e7b109a376d..7a148f113a3 100644
--- a/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt
@@ -1,4 +1,8 @@
 public open class InnerClassReferencesOuterTP<P : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
     public constructor<P : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerClassReferencesOuterTP<P>|
 
+    public open inner class Inner<Q : R|ft<P, P?>|, P : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public constructor<Q : R|ft<P, P?>|>(): R|test/InnerClassReferencesOuterTP.Inner<Q, P>|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt b/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt
index f1cbf6ec365..3dc72604bea 100644
--- a/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt
@@ -3,4 +3,22 @@ public open class InnerClassTypeMultipleGeneric : R|kotlin/Any| {
 
     public constructor(): R|test/InnerClassTypeMultipleGeneric|
 
+    public open inner class BaseOuter<H1 : R|ft<kotlin/Any, kotlin/Any?>|, H2 : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public constructor<H1 : R|ft<kotlin/Any, kotlin/Any?>|, H2 : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerClassTypeMultipleGeneric.BaseOuter<H1, H2>|
+
+        public abstract inner class BaseInner<H3 : R|ft<kotlin/Any, kotlin/Any?>|, H4 : R|ft<kotlin/Any, kotlin/Any?>|, H1 : R|ft<kotlin/Any, kotlin/Any?>|, H2 : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+            public constructor<H3 : R|ft<kotlin/Any, kotlin/Any?>|, H4 : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<H3, H4, H1, H2>|
+
+        }
+    }
+    public open inner class Outer<E1 : R|ft<kotlin/Any, kotlin/Any?>|, E2 : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/InnerClassTypeMultipleGeneric.BaseOuter<ft<kotlin/Int, kotlin/Int?>, ft<E1, E1?>>| {
+        public open fun bar(): R|ft<test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<ft<java/lang/Class<*>, java/lang/Class<*>?>, ft<kotlin/CharSequence, kotlin/CharSequence?>, ft<kotlin/Int, kotlin/Int?>, ft<E1, E1?>>, test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<ft<java/lang/Class<*>, java/lang/Class<*>?>, ft<kotlin/CharSequence, kotlin/CharSequence?>, ft<kotlin/Int, kotlin/Int?>, ft<E1, E1?>>?>|
+
+        public constructor<E1 : R|ft<kotlin/Any, kotlin/Any?>|, E2 : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerClassTypeMultipleGeneric.Outer<E1, E2>|
+
+        public open inner class Inner<E3 : R|ft<kotlin/Any, kotlin/Any?>|, E1 : R|ft<kotlin/Any, kotlin/Any?>|, E2 : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/InnerClassTypeMultipleGeneric.BaseOuter.BaseInner<ft<kotlin/Double, kotlin/Double?>, ft<kotlin/String, kotlin/String?>, ft<E2, E2?>, ft<E3, E3?>>| {
+            public constructor<E3 : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerClassTypeMultipleGeneric.Outer.Inner<E3, E1, E2>|
+
+        }
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt b/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt
index 9ed62127a52..d85102e27b5 100644
--- a/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt
@@ -1,4 +1,14 @@
 public open class InnerClassesInGeneric<P : R|ft<kotlin/Any, kotlin/Any?>|, Q : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
     public constructor<P : R|ft<kotlin/Any, kotlin/Any?>|, Q : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerClassesInGeneric<P, Q>|
 
+    public open inner class Inner<P : R|ft<kotlin/Any, kotlin/Any?>|, Q : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public constructor(): R|test/InnerClassesInGeneric.Inner<P, Q>|
+
+    }
+    public open inner class Inner2<P : R|ft<kotlin/Any, kotlin/Any?>|, Q : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/InnerClassesInGeneric.Inner<ft<P, P?>, ft<Q, Q?>>| {
+        public open operator fun iterator(): R|ft<kotlin/collections/MutableIterator<ft<P, P?>>, kotlin/collections/Iterator<ft<P, P?>>?>|
+
+        public constructor(): R|test/InnerClassesInGeneric.Inner2<P, Q>|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/InnerOfGeneric.fir.txt b/compiler/testData/loadJava/compiledJava/InnerOfGeneric.fir.txt
index 2581f4ddce4..77e441ae5b5 100644
--- a/compiler/testData/loadJava/compiledJava/InnerOfGeneric.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/InnerOfGeneric.fir.txt
@@ -1,4 +1,28 @@
 public open class InnerOfGeneric : R|kotlin/Any| {
     public constructor(): R|test/InnerOfGeneric|
 
+    public abstract inner class A<K : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public constructor<K : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerOfGeneric.A<K>|
+
+        public abstract inner class Inner<K : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/InnerOfGeneric.S<ft<K, K?>>| {
+            public constructor(): R|test/InnerOfGeneric.A.Inner<K>|
+
+        }
+    }
+    public open inner class B<L : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/InnerOfGeneric.A<ft<L, L?>>| {
+        public constructor<L : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerOfGeneric.B<L>|
+
+        public open inner class SubInner<L : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/InnerOfGeneric.A.Inner<ft<L, L?>>| {
+            @R|java/lang/Override|() public open operator fun iterator(): R|ft<kotlin/collections/MutableIterator<ft<L, L?>>, kotlin/collections/Iterator<ft<L, L?>>?>|
+
+            public constructor(): R|test/InnerOfGeneric.B.SubInner<L>|
+
+        }
+    }
+    public open inner class S<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public open operator fun iterator(): R|ft<kotlin/collections/MutableIterator<ft<E, E?>>, kotlin/collections/Iterator<ft<E, E?>>?>|
+
+        public constructor<E : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/InnerOfGeneric.S<E>|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt
index 65f649b6944..17e2aab9d28 100644
--- a/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt
@@ -1,4 +1,10 @@
 public final class MethodReferencesOuterClassTP<P : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
     public constructor<P : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/MethodReferencesOuterClassTP<P>|
 
+    public final inner class Inner<P : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public final fun <Q : R|ft<P, P?>|> f(): R|kotlin/Unit|
+
+        public constructor(): R|test/MethodReferencesOuterClassTP.Inner<P>|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/NestedClass.fir.txt b/compiler/testData/loadJava/compiledJava/NestedClass.fir.txt
index be6f897183a..3f5a5eed6fc 100644
--- a/compiler/testData/loadJava/compiledJava/NestedClass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/NestedClass.fir.txt
@@ -1,4 +1,8 @@
 public open class NestedClass : R|kotlin/Any| {
     public constructor(): R|test/NestedClass|
 
+    public open class Nested : R|kotlin/Any| {
+        public constructor(): R|test/NestedClass.Nested|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/OverrideMethod.fir.txt b/compiler/testData/loadJava/compiledJava/OverrideMethod.fir.txt
index 083272fa120..7cfab709a60 100644
--- a/compiler/testData/loadJava/compiledJava/OverrideMethod.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/OverrideMethod.fir.txt
@@ -1,4 +1,26 @@
 public open class OverrideMethod : R|kotlin/Any| {
     public constructor(): R|test/OverrideMethod|
 
+    public/*package*/ open inner class Base : R|test/OverrideMethod.SuperBase| {
+        public/*package*/ open fun foo(s: R|ft<kotlin/String, kotlin/String?>|): R|ft<kotlin/String, kotlin/String?>|
+
+        public/*package*/ open fun bar(): R|kotlin/Unit|
+
+        public/*package*/ constructor(): R|test/OverrideMethod.Base|
+
+    }
+    public/*package*/ open inner class Derived : R|test/OverrideMethod.Base| {
+        @R|java/lang/Override|() public/*package*/ open fun foo(s: R|ft<kotlin/String, kotlin/String?>|): R|ft<kotlin/String, kotlin/String?>|
+
+        public/*package*/ open fun baz(): R|kotlin/Unit|
+
+        public/*package*/ constructor(): R|test/OverrideMethod.Derived|
+
+    }
+    public/*package*/ open inner class SuperBase : R|kotlin/Any| {
+        public/*package*/ open fun quux(x: R|kotlin/Int|): R|kotlin/Unit|
+
+        public/*package*/ constructor(): R|test/OverrideMethod.SuperBase|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/PrivateMembers.fir.txt b/compiler/testData/loadJava/compiledJava/PrivateMembers.fir.txt
index cdcdc1974bc..dec2608cfeb 100644
--- a/compiler/testData/loadJava/compiledJava/PrivateMembers.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/PrivateMembers.fir.txt
@@ -9,4 +9,14 @@ public open class PrivateMembers : R|kotlin/Any| {
 
     private constructor(): R|test/PrivateMembers|
 
+    private open inner class Inner : R|kotlin/Any| {
+        private constructor(): R|test/PrivateMembers.Inner|
+
+    }
+    private open class Nested : R|kotlin/Any| {
+        private open static fun staticMethodInNested(): R|kotlin/Unit|
+
+        private constructor(): R|test/PrivateMembers.Nested|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/PrivateMembersInHierarchy.fir.txt b/compiler/testData/loadJava/compiledJava/PrivateMembersInHierarchy.fir.txt
index 80c5e86d98b..43236faf634 100644
--- a/compiler/testData/loadJava/compiledJava/PrivateMembersInHierarchy.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/PrivateMembersInHierarchy.fir.txt
@@ -1,4 +1,22 @@
 public open class PrivateMembersInHierarchy : R|kotlin/Any| {
     public constructor(): R|test/PrivateMembersInHierarchy|
 
+    public open class Sub : R|test/PrivateMembersInHierarchy.Super| {
+        private open field field: R|kotlin/Int|
+
+        private open fun method(): R|kotlin/Unit|
+
+        public constructor(): R|test/PrivateMembersInHierarchy.Sub|
+
+    }
+    public open class Super : R|kotlin/Any| {
+        private open field field: R|kotlin/Int|
+
+        private open field field2: R|kotlin/Int|
+
+        private open fun method(): R|kotlin/Unit|
+
+        public constructor(): R|test/PrivateMembersInHierarchy.Super|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/RawOverrides.fir.txt b/compiler/testData/loadJava/compiledJava/RawOverrides.fir.txt
index ade487575f3..11072a43f04 100644
--- a/compiler/testData/loadJava/compiledJava/RawOverrides.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/RawOverrides.fir.txt
@@ -1,4 +1,28 @@
 public open class RawOverrides : R|kotlin/Any| {
     public constructor(): R|test/RawOverrides|
 
+    public abstract interface A<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public abstract fun <E : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> foo(x: R|ft<T, T?>|, y: R|ft<kotlin/collections/MutableList<out ft<T, T?>>, kotlin/collections/List<out ft<T, T?>>?>|): R|ft<E, E?>|
+
+    }
+    public open inner class B : R|kotlin/Any|, R|test/RawOverrides.A<ft<kotlin/Any, kotlin/Any?>>| {
+        @R|java/lang/Override|() public open fun foo(x: R|ft<kotlin/Any, kotlin/Any?>|, y: R|ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>|): R|ft<kotlin/String, kotlin/String?>|
+
+        public constructor(): R|test/RawOverrides.B|
+
+    }
+    public open inner class C : R|kotlin/Any| {
+        public/*package*/ open fun <E : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|, F : R|ft<E, E?>|> bar(x: R|ft<F, F?>|, y: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap<ft<E, E?>, ft<F, F?>>, kotlin/collections/Map<ft<E, E?>, ft<F, F?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap<ft<E, E?>, ft<F, F?>>, kotlin/collections/Map<ft<E, E?>, ft<F, F?>>?>>?>|): R|ft<E, E?>|
+
+        public constructor(): R|test/RawOverrides.C|
+
+    }
+    public open inner class D : R|test/RawOverrides.C| {
+        @R|java/lang/Override|() public open fun bar(x: R|ft<kotlin/CharSequence, kotlin/CharSequence?>|, y: R|ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>|): R|ft<kotlin/String, kotlin/String?>|
+
+        public/*package*/ open fun <E : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|, F : R|ft<E, E?>|> bar(x: R|ft<F, F?>|, y: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap<ft<E, E?>, ft<F, F?>>, kotlin/collections/Map<ft<E, E?>, ft<F, F?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap<ft<E, E?>, ft<F, F?>>, kotlin/collections/Map<ft<E, E?>, ft<F, F?>>?>>?>|): R|ft<E, E?>|
+
+        public constructor(): R|test/RawOverrides.D|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.fir.txt
index 8ed99bdda3d..7f272605516 100644
--- a/compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.fir.txt
@@ -1,2 +1,10 @@
 public abstract interface RawTypeWithUpperBound : R|kotlin/Any| {
+    public abstract interface Bar : R|kotlin/Any| {
+        public abstract fun f(f: R|ft<test/RawTypeWithUpperBound.Foo<ft<kotlin/CharSequence, kotlin/CharSequence?>>, test/RawTypeWithUpperBound.Foo<*>?>|): R|kotlin/Unit|
+
+        public abstract fun g(f: R|ft<kotlin/collections/MutableList<ft<test/RawTypeWithUpperBound.Foo<ft<kotlin/CharSequence, kotlin/CharSequence?>>, test/RawTypeWithUpperBound.Foo<*>?>>, kotlin/collections/List<ft<test/RawTypeWithUpperBound.Foo<ft<kotlin/CharSequence, kotlin/CharSequence?>>, test/RawTypeWithUpperBound.Foo<*>?>>?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Foo<T : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> : R|kotlin/Any| {
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt b/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt
index cf5fe5352ec..42dc0dfa1fc 100644
--- a/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt
@@ -5,4 +5,6 @@ public final class UnboundWildcard : R|kotlin/Any| {
 
     public constructor(): R|test/UnboundWildcard|
 
+    public abstract interface MyClass<T : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> : R|kotlin/Any| {
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt b/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt
index 562024250c9..07f5565509e 100644
--- a/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt
@@ -3,4 +3,8 @@ public open class WildcardBounds : R|kotlin/Any| {
 
     public constructor(): R|test/WildcardBounds|
 
+    public/*package*/ open class A<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public/*package*/ constructor<T : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/WildcardBounds.A<T>|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedConstructor.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedConstructor.fir.txt
index a60be606ac5..c43fe57ab33 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedConstructor.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedConstructor.fir.txt
@@ -1,4 +1,8 @@
 public open class AnnotatedConstructor : R|kotlin/Any| {
     @R|test/AnnotatedConstructor.Anno|(String(constructor)) public constructor(): R|test/AnnotatedConstructor|
 
+    public final annotation class Anno : R|kotlin/Annotation| {
+        public constructor(value: R|kotlin/String|): R|test/AnnotatedConstructor.Anno|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt
index 292f289bd88..082d9d61544 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt
@@ -8,4 +8,12 @@ public final enum class AnnotatedEnumEntry : R|kotlin/Enum<ft<test/AnnotatedEnum
     public final static fun valueOf(value: R|kotlin/String|): R|test/AnnotatedEnumEntry| {
     }
 
+    public final annotation class Anno : R|kotlin/Annotation| {
+        public constructor(value: R|kotlin/String|): R|test/AnnotatedEnumEntry.Anno|
+
+    }
+    public final annotation class Anno2 : R|kotlin/Annotation| {
+        public constructor(): R|test/AnnotatedEnumEntry.Anno2|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.fir.txt
index feaa566865e..a634a0660cc 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.fir.txt
@@ -5,4 +5,8 @@ public open class AnnotatedField : R|kotlin/Any| {
 
     public constructor(): R|test/AnnotatedField|
 
+    public final annotation class Anno : R|kotlin/Annotation| {
+        public constructor(value: R|kotlin/String|): R|test/AnnotatedField.Anno|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.fir.txt
index 2caa6b7218f..8d39c605bcf 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.fir.txt
@@ -3,4 +3,8 @@ public open class AnnotatedMethod : R|kotlin/Any| {
 
     public constructor(): R|test/AnnotatedMethod|
 
+    public final annotation class Anno : R|kotlin/Annotation| {
+        public constructor(value: R|kotlin/Int|): R|test/AnnotatedMethod.Anno|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedParameterInInnerClassConstructor.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedParameterInInnerClassConstructor.fir.txt
index 0840720b7de..a04c979e726 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedParameterInInnerClassConstructor.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedParameterInInnerClassConstructor.fir.txt
@@ -1,4 +1,16 @@
 public/*package*/ open class AnnotatedParameterInInnerClassConstructor : R|kotlin/Any| {
     public/*package*/ constructor(): R|test/AnnotatedParameterInInnerClassConstructor|
 
+    public final annotation class Anno : R|kotlin/Annotation| {
+        public constructor(value: R|kotlin/String|): R|test/AnnotatedParameterInInnerClassConstructor.Anno|
+
+    }
+    public/*package*/ open inner class Inner : R|kotlin/Any| {
+        public/*package*/ constructor(@R|test/AnnotatedParameterInInnerClassConstructor.Anno|(String(a)) a: R|ft<kotlin/String, kotlin/String?>|, @R|test/AnnotatedParameterInInnerClassConstructor.Anno|(String(b)) b: R|ft<kotlin/String, kotlin/String?>|): R|test/AnnotatedParameterInInnerClassConstructor.Inner|
+
+    }
+    public/*package*/ open inner class InnerGeneric<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public/*package*/ constructor<T : R|ft<kotlin/Any, kotlin/Any?>|>(@R|test/AnnotatedParameterInInnerClassConstructor.Anno|(String(a)) a: R|ft<kotlin/String, kotlin/String?>|, @R|test/AnnotatedParameterInInnerClassConstructor.Anno|(String(b)) b: R|ft<kotlin/String, kotlin/String?>|): R|test/AnnotatedParameterInInnerClassConstructor.InnerGeneric<T>|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt
index 75505dbbc3a..8c7184c1d0d 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt
@@ -3,4 +3,8 @@ public/*package*/ open class AnnotatedTypeInFun : R|kotlin/Any| {
 
     public/*package*/ constructor(): R|test/AnnotatedTypeInFun|
 
+    @R|kotlin/annotation/Target|(<implicitArrayOf>(R|kotlin/annotation/AnnotationTarget.TYPE|())) public final annotation class Anno : R|kotlin/Annotation| {
+        public constructor(value: R|kotlin/String|): R|test/AnnotatedTypeInFun.Anno|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt
index 7f5f461bfa8..d3481c353a6 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt
@@ -3,4 +3,8 @@ public open class AnnotatedValueParameter : R|kotlin/Any| {
 
     public constructor(): R|test/AnnotatedValueParameter|
 
+    public final annotation class Anno : R|kotlin/Annotation| {
+        public constructor(value: R|kotlin/String|): R|test/AnnotatedValueParameter.Anno|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.fir.txt
index 9223a7c130a..604a507f6f9 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.fir.txt
@@ -1,2 +1,38 @@
 public abstract interface AnnotationInParam : R|kotlin/Any| {
+    @R|test/AnnotationInParam.MyAnnotationWithParam|(@R|test/AnnotationInParam.MyAnnotation|(String(test)) ) public open class A : R|kotlin/Any| {
+        public constructor(): R|test/AnnotationInParam.A|
+
+    }
+    @R|test/AnnotationInParam.MyAnnotationWithParam2|(@R|test/AnnotationInParam.MyAnnotation2|(<implicitArrayOf>(String(test), String(test2))) ) public open class B : R|kotlin/Any| {
+        public constructor(): R|test/AnnotationInParam.B|
+
+    }
+    @R|test/AnnotationInParam.MyAnnotationWithParam3|(@R|test/AnnotationInParam.MyAnnotation3|(String(f), String(s)) ) public open class C : R|kotlin/Any| {
+        public constructor(): R|test/AnnotationInParam.C|
+
+    }
+    public final annotation class MyAnnotation : R|kotlin/Annotation| {
+        public constructor(value: R|kotlin/String|): R|test/AnnotationInParam.MyAnnotation|
+
+    }
+    public final annotation class MyAnnotation2 : R|kotlin/Annotation| {
+        public constructor(vararg value: R|kotlin/Array<kotlin/String>|): R|test/AnnotationInParam.MyAnnotation2|
+
+    }
+    public final annotation class MyAnnotation3 : R|kotlin/Annotation| {
+        public constructor(first: R|kotlin/String|, second: R|kotlin/String|): R|test/AnnotationInParam.MyAnnotation3|
+
+    }
+    public final annotation class MyAnnotationWithParam : R|kotlin/Annotation| {
+        public constructor(value: R|test/AnnotationInParam.MyAnnotation|): R|test/AnnotationInParam.MyAnnotationWithParam|
+
+    }
+    public final annotation class MyAnnotationWithParam2 : R|kotlin/Annotation| {
+        public constructor(value: R|test/AnnotationInParam.MyAnnotation2|): R|test/AnnotationInParam.MyAnnotationWithParam2|
+
+    }
+    public final annotation class MyAnnotationWithParam3 : R|kotlin/Annotation| {
+        public constructor(value: R|test/AnnotationInParam.MyAnnotation3|): R|test/AnnotationInParam.MyAnnotationWithParam3|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationRetentions.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotationRetentions.fir.txt
index a6788e249f6..fe3e5401cc3 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationRetentions.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotationRetentions.fir.txt
@@ -1,4 +1,36 @@
 public open class AnnotationRetentions : R|kotlin/Any| {
     public constructor(): R|test/AnnotationRetentions|
 
+    public final annotation class BaseAnnotation : R|kotlin/Annotation| {
+        public constructor(): R|test/AnnotationRetentions.BaseAnnotation|
+
+    }
+    @R|test/AnnotationRetentions.BaseAnnotation|() public/*package*/ open inner class BaseClass : R|kotlin/Any| {
+        public/*package*/ constructor(): R|test/AnnotationRetentions.BaseClass|
+
+    }
+    @R|kotlin/annotation/Retention|(R|kotlin/annotation/AnnotationRetention.BINARY|()) public final annotation class BinaryAnnotation : R|kotlin/Annotation| {
+        public constructor(): R|test/AnnotationRetentions.BinaryAnnotation|
+
+    }
+    @R|test/AnnotationRetentions.BinaryAnnotation|() public/*package*/ open inner class BinaryClass : R|kotlin/Any| {
+        public/*package*/ constructor(): R|test/AnnotationRetentions.BinaryClass|
+
+    }
+    @R|kotlin/annotation/Retention|(R|kotlin/annotation/AnnotationRetention.RUNTIME|()) public final annotation class RuntimeAnnotation : R|kotlin/Annotation| {
+        public constructor(): R|test/AnnotationRetentions.RuntimeAnnotation|
+
+    }
+    @R|test/AnnotationRetentions.RuntimeAnnotation|() public/*package*/ open inner class RuntimeClass : R|kotlin/Any| {
+        public/*package*/ constructor(): R|test/AnnotationRetentions.RuntimeClass|
+
+    }
+    @R|kotlin/annotation/Retention|(R|kotlin/annotation/AnnotationRetention.SOURCE|()) public final annotation class SourceAnnotation : R|kotlin/Annotation| {
+        public constructor(): R|test/AnnotationRetentions.SourceAnnotation|
+
+    }
+    @R|test/AnnotationRetentions.SourceAnnotation|() public/*package*/ open inner class SourceClass : R|kotlin/Any| {
+        public/*package*/ constructor(): R|test/AnnotationRetentions.SourceClass|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationTargets.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotationTargets.fir.txt
index 6d5a6a4ec5e..597dc0d7cfd 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationTargets.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotationTargets.fir.txt
@@ -1,4 +1,44 @@
 public open class AnnotationTargets : R|kotlin/Any| {
     public constructor(): R|test/AnnotationTargets|
 
+    @R|kotlin/annotation/Target|(<implicitArrayOf>(R|kotlin/annotation/AnnotationTarget.ANNOTATION_CLASS|())) public final annotation class annotation : R|kotlin/Annotation| {
+        public constructor(): R|test/AnnotationTargets.annotation|
+
+    }
+    public final annotation class base : R|kotlin/Annotation| {
+        public constructor(): R|test/AnnotationTargets.base|
+
+    }
+    @R|kotlin/annotation/Target|(<implicitArrayOf>(R|kotlin/annotation/AnnotationTarget.CONSTRUCTOR|())) public final annotation class constructor : R|kotlin/Annotation| {
+        public constructor(): R|test/AnnotationTargets.constructor|
+
+    }
+    @R|kotlin/annotation/Target|(<implicitArrayOf>(R|kotlin/annotation/AnnotationTarget.FIELD|())) public final annotation class field : R|kotlin/Annotation| {
+        public constructor(): R|test/AnnotationTargets.field|
+
+    }
+    @R|kotlin/annotation/Target|(<implicitArrayOf>(R|kotlin/annotation/AnnotationTarget.LOCAL_VARIABLE|())) public final annotation class local : R|kotlin/Annotation| {
+        public constructor(): R|test/AnnotationTargets.local|
+
+    }
+    @R|kotlin/annotation/Target|(<implicitArrayOf>(R|kotlin/annotation/AnnotationTarget.FUNCTION|(), R|kotlin/annotation/AnnotationTarget.PROPERTY_GETTER|(), R|kotlin/annotation/AnnotationTarget.PROPERTY_SETTER|())) public final annotation class method : R|kotlin/Annotation| {
+        public constructor(): R|test/AnnotationTargets.method|
+
+    }
+    @R|kotlin/annotation/Target|(<implicitArrayOf>(R|kotlin/annotation/AnnotationTarget.FIELD|(), R|kotlin/annotation/AnnotationTarget.CONSTRUCTOR|(), R|kotlin/annotation/AnnotationTarget.FUNCTION|(), R|kotlin/annotation/AnnotationTarget.PROPERTY_GETTER|(), R|kotlin/annotation/AnnotationTarget.PROPERTY_SETTER|())) public final annotation class multiple : R|kotlin/Annotation| {
+        public constructor(): R|test/AnnotationTargets.multiple|
+
+    }
+    @R|kotlin/annotation/Target|(<implicitArrayOf>()) public final annotation class packag : R|kotlin/Annotation| {
+        public constructor(): R|test/AnnotationTargets.packag|
+
+    }
+    @R|kotlin/annotation/Target|(<implicitArrayOf>(R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|())) public final annotation class parameter : R|kotlin/Annotation| {
+        public constructor(): R|test/AnnotationTargets.parameter|
+
+    }
+    @R|kotlin/annotation/Target|(<implicitArrayOf>(R|kotlin/annotation/AnnotationTarget.CLASS|(), R|kotlin/annotation/AnnotationTarget.FILE|())) public final annotation class type : R|kotlin/Annotation| {
+        public constructor(): R|test/AnnotationTargets.type|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.fir.txt
index 258b1dfa399..2f241bbdebc 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.fir.txt
@@ -1,4 +1,12 @@
 public open class ArithmeticExpressionInParam : R|kotlin/Any| {
     public constructor(): R|test/ArithmeticExpressionInParam|
 
+    public final annotation class Anno : R|kotlin/Annotation| {
+        public constructor(value: R|kotlin/Int|): R|test/ArithmeticExpressionInParam.Anno|
+
+    }
+    @R|test/ArithmeticExpressionInParam.Anno|(Int(42)) public open class Class : R|kotlin/Any| {
+        public constructor(): R|test/ArithmeticExpressionInParam.Class|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.fir.txt
index 57fdfc61e4b..bbc0e9af37e 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.fir.txt
@@ -1,2 +1,6 @@
 public abstract interface ArrayOfEnumInParam : R|kotlin/Any| {
+    @R|kotlin/annotation/Target|(<implicitArrayOf>(R|kotlin/annotation/AnnotationTarget.FIELD|(), R|kotlin/annotation/AnnotationTarget.CONSTRUCTOR|())) public final annotation class targetAnnotation : R|kotlin/Annotation| {
+        public constructor(value: R|kotlin/String|): R|test/ArrayOfEnumInParam.targetAnnotation|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.fir.txt
index b0fb5241300..10b7e36d993 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.fir.txt
@@ -1,2 +1,10 @@
 public abstract interface ArrayOfStringInParam : R|kotlin/Any| {
+    @R|test/ArrayOfStringInParam.MyAnnotation|(<implicitArrayOf>(String(a), String(b), String(c))) public open class A : R|kotlin/Any| {
+        public constructor(): R|test/ArrayOfStringInParam.A|
+
+    }
+    public final annotation class MyAnnotation : R|kotlin/Annotation| {
+        public constructor(vararg value: R|kotlin/Array<kotlin/String>|): R|test/ArrayOfStringInParam.MyAnnotation|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.fir.txt
index 33900d97ef3..ac16c143e73 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.fir.txt
@@ -1,4 +1,12 @@
 public open class ClassObjectArrayInParam : R|kotlin/Any| {
     public constructor(): R|test/ClassObjectArrayInParam|
 
+    public final annotation class Anno : R|kotlin/Annotation| {
+        public constructor(vararg value: R|kotlin/Array<kotlin/reflect/KClass<*>>|): R|test/ClassObjectArrayInParam.Anno|
+
+    }
+    @R|test/ClassObjectArrayInParam.Anno|(<implicitArrayOf>(<getClass>(<getClass>(R|ft<test/ClassObjectArrayInParam, test/ClassObjectArrayInParam?>|)), <getClass>(<getClass>(R|ft<test/ClassObjectArrayInParam.Nested, test/ClassObjectArrayInParam.Nested?>|)), <getClass>(<getClass>(R|ft<kotlin/String, kotlin/String?>|)), <getClass>(<getClass>(R|ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>|)), <getClass>(<getClass>(R|ERROR CLASS: Unexpected JavaType: org.jetbrains.kotlin.fir.types.builder.FirResolvedTypeRefBuilder@4abd3f24|)), <getClass>(<getClass>(R|ERROR CLASS: Unexpected JavaType: org.jetbrains.kotlin.fir.types.builder.FirResolvedTypeRefBuilder@6214f104|)), <getClass>(<getClass>(R|ERROR CLASS: Unexpected JavaType: org.jetbrains.kotlin.fir.types.builder.FirResolvedTypeRefBuilder@5450f4f|)))) public open class Nested : R|kotlin/Any| {
+        public constructor(): R|test/ClassObjectArrayInParam.Nested|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.fir.txt
index c7ba20e1555..8fd1dcc0b17 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.fir.txt
@@ -1,4 +1,12 @@
 public open class ClassObjectInParam : R|kotlin/Any| {
     public constructor(): R|test/ClassObjectInParam|
 
+    public final annotation class Anno : R|kotlin/Annotation| {
+        public constructor(value: R|kotlin/reflect/KClass<*>|): R|test/ClassObjectInParam.Anno|
+
+    }
+    @R|test/ClassObjectInParam.Anno|(<getClass>(<getClass>(R|ft<test/ClassObjectInParam, test/ClassObjectInParam?>|))) public open class Nested : R|kotlin/Any| {
+        public constructor(): R|test/ClassObjectInParam.Nested|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.fir.txt
index 72d26afdaa9..a944300be3d 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.fir.txt
@@ -1,4 +1,12 @@
 public open class ClassObjectInParamRaw : R|kotlin/Any| {
     public constructor(): R|test/ClassObjectInParamRaw|
 
+    public final annotation class Anno : R|kotlin/Annotation| {
+        public constructor(value: R|kotlin/reflect/KClass<kotlin/Any>|, arg: R|kotlin/Array<kotlin/reflect/KClass<kotlin/Any>>|): R|test/ClassObjectInParamRaw.Anno|
+
+    }
+    @R|test/ClassObjectInParamRaw.Anno|(<getClass>(<getClass>(R|ft<test/ClassObjectInParamRaw, test/ClassObjectInParamRaw?>|)), <implicitArrayOf>()) public open class Nested : R|kotlin/Any| {
+        public constructor(): R|test/ClassObjectInParamRaw.Nested|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.fir.txt
index c6c33365ba3..0984a0501db 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.fir.txt
@@ -1,4 +1,8 @@
 public open class ClassObjectInParamVariance : R|kotlin/Any| {
     public constructor(): R|test/ClassObjectInParamVariance|
 
+    public final annotation class Anno : R|kotlin/Annotation| {
+        public constructor(arg1: R|kotlin/reflect/KClass<out ft<kotlin/Int, kotlin/Int?>>|, arg2: R|kotlin/reflect/KClass<in ft<kotlin/Int, kotlin/Int?>>|, arg3: R|kotlin/Array<kotlin/reflect/KClass<out ft<kotlin/Int, kotlin/Int?>>>|, arg4: R|kotlin/Array<kotlin/reflect/KClass<in ft<kotlin/Int, kotlin/Int?>>>|, arg5: R|kotlin/Array<kotlin/reflect/KClass<out ft<java/lang/Class<*>, java/lang/Class<*>?>>>|, arg6: R|kotlin/Array<kotlin/reflect/KClass<in ft<java/lang/Class<*>, java/lang/Class<*>?>>>|, arg7: R|kotlin/Array<kotlin/reflect/KClass<out ft<java/lang/Class<ft<kotlin/Int, kotlin/Int?>>, java/lang/Class<ft<kotlin/Int, kotlin/Int?>>?>>>|, arg8: R|kotlin/Array<kotlin/reflect/KClass<in ft<java/lang/Class<ft<kotlin/Int, kotlin/Int?>>, java/lang/Class<ft<kotlin/Int, kotlin/Int?>>?>>>|): R|test/ClassObjectInParamVariance.Anno|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.fir.txt
index 5ad89fb1da2..886ea4d0dd4 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.fir.txt
@@ -1,2 +1,19 @@
 public abstract interface CustomAnnotation : R|kotlin/Any| {
+    public final annotation class MyAnnotation : R|kotlin/Annotation| {
+        public constructor(value: R|test/CustomAnnotation.MyEnum|): R|test/CustomAnnotation.MyAnnotation|
+
+    }
+    public final enum class MyEnum : R|kotlin/Enum<ft<test/CustomAnnotation.MyEnum, test/CustomAnnotation.MyEnum?>>| {
+        public final static enum entry ONE: R|@EnhancedNullability test/CustomAnnotation.MyEnum|
+        public final static fun values(): R|kotlin/Array<test/CustomAnnotation.MyEnum>| {
+        }
+
+        public final static fun valueOf(value: R|kotlin/String|): R|test/CustomAnnotation.MyEnum| {
+        }
+
+    }
+    @R|test/CustomAnnotation.MyAnnotation|(R|test/CustomAnnotation.MyEnum.ONE|()) public open class MyTest : R|kotlin/Any| {
+        public constructor(): R|test/CustomAnnotation.MyTest|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.fir.txt
index 81494af26f7..992f6d633af 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.fir.txt
@@ -1,2 +1,10 @@
 public abstract interface CustomAnnotationWithDefaultParameter : R|kotlin/Any| {
+    public final annotation class MyAnnotation : R|kotlin/Annotation| {
+        public constructor(first: R|kotlin/String|, second: R|kotlin/String| = String(s)): R|test/CustomAnnotationWithDefaultParameter.MyAnnotation|
+
+    }
+    @R|test/CustomAnnotationWithDefaultParameter.MyAnnotation|(String(f), String(s)) public open class MyTest : R|kotlin/Any| {
+        public constructor(): R|test/CustomAnnotationWithDefaultParameter.MyTest|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.fir.txt
index 61d8382cb3b..650ecca3909 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.fir.txt
@@ -1,2 +1,10 @@
 public abstract interface EmptyArrayInParam : R|kotlin/Any| {
+    @R|test/EmptyArrayInParam.MyAnnotation|(<implicitArrayOf>()) public open class A : R|kotlin/Any| {
+        public constructor(): R|test/EmptyArrayInParam.A|
+
+    }
+    public final annotation class MyAnnotation : R|kotlin/Annotation| {
+        public constructor(vararg value: R|kotlin/Array<kotlin/String>|): R|test/EmptyArrayInParam.MyAnnotation|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.fir.txt
index 54fc9a7c894..dfc22821a93 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.fir.txt
@@ -3,4 +3,21 @@ public open class EnumArgumentWithCustomToString : R|kotlin/Any| {
 
     public constructor(): R|test/EnumArgumentWithCustomToString|
 
+    public final enum class E : R|kotlin/Enum<ft<test/EnumArgumentWithCustomToString.E, test/EnumArgumentWithCustomToString.E?>>| {
+        public final static enum entry CAKE: R|@EnhancedNullability test/EnumArgumentWithCustomToString.E|
+        public final static fun values(): R|kotlin/Array<test/EnumArgumentWithCustomToString.E>| {
+        }
+
+        public final static fun valueOf(value: R|kotlin/String|): R|test/EnumArgumentWithCustomToString.E| {
+        }
+
+    }
+    public final annotation class EnumAnno : R|kotlin/Annotation| {
+        public constructor(value: R|test/EnumArgumentWithCustomToString.E|): R|test/EnumArgumentWithCustomToString.EnumAnno|
+
+    }
+    public final annotation class EnumArrayAnno : R|kotlin/Annotation| {
+        public constructor(vararg value: R|kotlin/Array<test/EnumArgumentWithCustomToString.E>|): R|test/EnumArgumentWithCustomToString.EnumArrayAnno|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt
index 728fef6060d..b4349c85469 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt
@@ -10,4 +10,8 @@ public final enum class EnumConstructorParameter : R|kotlin/Enum<ft<test/EnumCon
     public final static fun valueOf(value: R|kotlin/String|): R|test/EnumConstructorParameter| {
     }
 
+    public final annotation class Anno : R|kotlin/Annotation| {
+        public constructor(value: R|kotlin/String|): R|test/EnumConstructorParameter.Anno|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.fir.txt
index 3858bc954b8..d9eda19d467 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.fir.txt
@@ -1,2 +1,10 @@
 public abstract interface EnumInParam : R|kotlin/Any| {
+    public final annotation class MyRetention : R|kotlin/Annotation| {
+        public constructor(value: R|java/lang/annotation/RetentionPolicy|): R|test/EnumInParam.MyRetention|
+
+    }
+    @R|test/EnumInParam.MyRetention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) public final annotation class RetentionAnnotation : R|kotlin/Annotation| {
+        public constructor(value: R|kotlin/String|): R|test/EnumInParam.RetentionAnnotation|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.fir.txt
index 7c6a3ab455a..8cd3c726cfc 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.fir.txt
@@ -3,4 +3,17 @@ public open class NestedEnumArgument : R|kotlin/Any| {
 
     public constructor(): R|test/NestedEnumArgument|
 
+    public final annotation class Anno : R|kotlin/Annotation| {
+        public constructor(value: R|test/NestedEnumArgument.E|): R|test/NestedEnumArgument.Anno|
+
+    }
+    public final enum class E : R|kotlin/Enum<ft<test/NestedEnumArgument.E, test/NestedEnumArgument.E?>>| {
+        public final static enum entry FIRST: R|@EnhancedNullability test/NestedEnumArgument.E|
+        public final static fun values(): R|kotlin/Array<test/NestedEnumArgument.E>| {
+        }
+
+        public final static fun valueOf(value: R|kotlin/String|): R|test/NestedEnumArgument.E| {
+        }
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.fir.txt
index 3e4b81f33df..3495706f23d 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.fir.txt
@@ -1,2 +1,10 @@
 public abstract interface PrimitiveValueInParam : R|kotlin/Any| {
+    @R|test/PrimitiveValueInParam.Ann|(Int(1), Long(1), Double(1.0), Float(1.0), Boolean(true), String(str)) public open class A : R|kotlin/Any| {
+        public constructor(): R|test/PrimitiveValueInParam.A|
+
+    }
+    public final annotation class Ann : R|kotlin/Annotation| {
+        public constructor(i: R|kotlin/Int|, l: R|kotlin/Long|, d: R|kotlin/Double|, f: R|kotlin/Float|, bool: R|kotlin/Boolean|, str: R|kotlin/String|): R|test/PrimitiveValueInParam.Ann|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.fir.txt
index d38c9ea07d7..08e96ca20e4 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.fir.txt
@@ -1,2 +1,10 @@
 public abstract interface RecursiveAnnotation : R|kotlin/Any| {
+    @R|test/RecursiveAnnotation.B|(@R|test/RecursiveAnnotation.A|(String(test)) ) public final annotation class A : R|kotlin/Annotation| {
+        public constructor(value: R|kotlin/String|): R|test/RecursiveAnnotation.A|
+
+    }
+    @R|test/RecursiveAnnotation.B|(@R|test/RecursiveAnnotation.A|(String(test)) ) public final annotation class B : R|kotlin/Annotation| {
+        public constructor(value: R|test/RecursiveAnnotation.A|): R|test/RecursiveAnnotation.B|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.fir.txt
index c51ebdd9764..0fc29d21bfa 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.fir.txt
@@ -1,2 +1,10 @@
 public abstract interface RecursiveAnnotation2 : R|kotlin/Any| {
+    public final annotation class A : R|kotlin/Annotation| {
+        public constructor(value: R|test/RecursiveAnnotation2.B|): R|test/RecursiveAnnotation2.A|
+
+    }
+    @R|test/RecursiveAnnotation2.A|(@R|test/RecursiveAnnotation2.B|(String(test)) ) public final annotation class B : R|kotlin/Annotation| {
+        public constructor(value: R|kotlin/String|): R|test/RecursiveAnnotation2.B|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.fir.txt
index 7b887cc4916..ef9d865c2f9 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.fir.txt
@@ -1,2 +1,10 @@
 public abstract interface StringConcatenationInParam : R|kotlin/Any| {
+    public final annotation class Anno : R|kotlin/Annotation| {
+        public constructor(value: R|kotlin/String|): R|test/StringConcatenationInParam.Anno|
+
+    }
+    @R|test/StringConcatenationInParam.Anno|(String(hello)) public open class Class : R|kotlin/Any| {
+        public constructor(): R|test/StringConcatenationInParam.Class|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.fir.txt
index d1bce494437..84d82fef9d8 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.fir.txt
@@ -1,4 +1,12 @@
 public abstract interface StringConstantInParam : R|kotlin/Any| {
     public final static field HEL: R|ft<kotlin/String, kotlin/String?>| = String(hel)
 
+    public final annotation class Anno : R|kotlin/Annotation| {
+        public constructor(value: R|kotlin/String|): R|test/StringConstantInParam.Anno|
+
+    }
+    @R|test/StringConstantInParam.Anno|(String(hello)) public open class Class : R|kotlin/Any| {
+        public constructor(): R|test/StringConstantInParam.Class|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/StringInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/StringInParam.fir.txt
index b41313f8829..4a5fc7adcbc 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/StringInParam.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/StringInParam.fir.txt
@@ -1,2 +1,10 @@
 public abstract interface StringInParam : R|kotlin/Any| {
+    public final annotation class Anno : R|kotlin/Annotation| {
+        public constructor(value: R|kotlin/String|): R|test/StringInParam.Anno|
+
+    }
+    @R|test/StringInParam.Anno|(String(hello)) public open class Class : R|kotlin/Any| {
+        public constructor(): R|test/StringInParam.Class|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt b/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt
index c4277cd83c3..6acd93fc9df 100644
--- a/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.fir.txt
@@ -7,4 +7,8 @@ public final enum class EnumWithSpecializedEntry : R|kotlin/Enum<ft<test/EnumWit
     public final static fun valueOf(value: R|kotlin/String|): R|test/EnumWithSpecializedEntry| {
     }
 
+    public/*package*/ open class Nested : R|kotlin/Any| {
+        public/*package*/ constructor(): R|test/EnumWithSpecializedEntry.Nested|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt
index 89b0aa96d49..b8e262e2816 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt
@@ -3,4 +3,6 @@ public final class StarProjection : R|kotlin/Any| {
 
     public constructor(): R|test/StarProjection|
 
+    public abstract interface MyClass<T : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> : R|kotlin/Any| {
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.fir.txt
index 227c1585564..d6084944f6d 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.fir.txt
@@ -1,2 +1,30 @@
 public abstract interface PropagateTypeArgumentNullable : R|kotlin/Any| {
+    public abstract interface Sub : R|test/PropagateTypeArgumentNullable.Super| {
+        public abstract fun outS(p: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+
+        public abstract fun invOutS(p: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|): R|kotlin/Unit|
+
+        public abstract fun outOutS(p: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|): R|kotlin/Unit|
+
+        public abstract fun outR(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+
+        public abstract fun invR(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+
+        public abstract fun invOutR(): R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun outS(p: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+
+        public abstract fun invOutS(p: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|): R|kotlin/Unit|
+
+        public abstract fun outOutS(p: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|): R|kotlin/Unit|
+
+        public abstract fun outR(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+
+        public abstract fun invR(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+
+        public abstract fun invOutR(): R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.fir.txt
index 3f7d79ec944..c52c62a0dc0 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface ChangeProjectionKind1 : R|kotlin/Any| {
+    public abstract interface Sub : R|test/ChangeProjectionKind1.Super| {
+        public abstract fun foo(p: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(p: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.fir.txt
index f7fca4cd27b..5f08c2888aa 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.fir.txt
@@ -1,2 +1,16 @@
 public abstract interface DeeplySubstitutedClassParameter : R|kotlin/Any| {
+    public abstract interface Middle<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/DeeplySubstitutedClassParameter.Super<ft<E, E?>>| {
+        public abstract fun foo(p: R|ft<E, E?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Sub : R|test/DeeplySubstitutedClassParameter.Middle<ft<kotlin/String, kotlin/String?>>| {
+        public abstract fun foo(p: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public abstract fun foo(p: R|ft<T, T?>|): R|kotlin/Unit|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.fir.txt
index 38ce7269fc5..bd325964c4c 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.fir.txt
@@ -1,2 +1,14 @@
 public abstract interface DeeplySubstitutedClassParameter2 : R|kotlin/Any| {
+    public abstract interface Middle<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/DeeplySubstitutedClassParameter2.Super<ft<E, E?>>| {
+    }
+    public abstract interface Sub : R|test/DeeplySubstitutedClassParameter2.Middle<ft<kotlin/String, kotlin/String?>>| {
+        public abstract fun foo(p: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public abstract fun foo(p: R|ft<T, T?>|): R|kotlin/Unit|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVararg.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVararg.fir.txt
index f7642da6e20..35ef594c1fb 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVararg.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVararg.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface InheritNotVararg : R|kotlin/Any| {
+    public abstract interface Sub : R|test/InheritNotVararg.Super| {
+        public abstract fun foo(vararg p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.fir.txt
index 9951bc1f004..d0c291967d9 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface InheritNotVarargInteger : R|kotlin/Any| {
+    public abstract interface Sub : R|test/InheritNotVarargInteger.Super| {
+        public abstract fun foo(vararg p: R|ft<kotlin/Array<ft<kotlin/Int, kotlin/Int?>>, kotlin/Array<out ft<kotlin/Int, kotlin/Int?>>?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(p: R|ft<kotlin/Array<ft<kotlin/Int, kotlin/Int?>>, kotlin/Array<out ft<kotlin/Int, kotlin/Int?>>?>|): R|kotlin/Unit|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.fir.txt
index de852f7f8f8..d3cf950cdbe 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface InheritNotVarargNotNull : R|kotlin/Any| {
+    public abstract interface Sub : R|test/InheritNotVarargNotNull.Super| {
+        public abstract fun foo(vararg p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.fir.txt
index 3d947edad17..9ebf750ecd3 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface InheritNotVarargPrimitive : R|kotlin/Any| {
+    public abstract interface Sub : R|test/InheritNotVarargPrimitive.Super| {
+        public abstract fun foo(vararg p: R|ft<kotlin/IntArray, kotlin/IntArray?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(p: R|ft<kotlin/IntArray, kotlin/IntArray?>|): R|kotlin/Unit|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNullability.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNullability.fir.txt
index 3e550e5a48f..6b09456d94d 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNullability.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNullability.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface InheritNullability : R|kotlin/Any| {
+    public abstract interface Sub : R|test/InheritNullability.Super| {
+        public abstract fun foo(p: R|@EnhancedNullability kotlin/String|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(@R|org/jetbrains/annotations/NotNull|() p: R|@EnhancedNullability kotlin/String|): R|kotlin/Unit|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVararg.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVararg.fir.txt
index 4355b91cd67..eab2fc6c4b5 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVararg.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVararg.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface InheritVararg : R|kotlin/Any| {
+    public abstract interface Sub : R|test/InheritVararg.Super| {
+        public abstract fun foo(p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(vararg p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargInteger.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargInteger.fir.txt
index 269efee4594..bc6acdb1f37 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargInteger.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargInteger.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface InheritVarargInteger : R|kotlin/Any| {
+    public abstract interface Sub : R|test/InheritVarargInteger.Super| {
+        public abstract fun foo(p: R|ft<kotlin/Array<ft<kotlin/Int, kotlin/Int?>>, kotlin/Array<out ft<kotlin/Int, kotlin/Int?>>?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(vararg p: R|ft<kotlin/Array<ft<kotlin/Int, kotlin/Int?>>, kotlin/Array<out ft<kotlin/Int, kotlin/Int?>>?>|): R|kotlin/Unit|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.fir.txt
index 72cbbdda5b8..bc75b4183f1 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface InheritVarargNotNull : R|kotlin/Any| {
+    public abstract interface Sub : R|test/InheritVarargNotNull.Super| {
+        public abstract fun foo(p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(vararg p: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.fir.txt
index 0630d3cbac2..775a404a66a 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface InheritVarargPrimitive : R|kotlin/Any| {
+    public abstract interface Sub : R|test/InheritVarargPrimitive.Super| {
+        public abstract fun foo(p: R|ft<kotlin/IntArray, kotlin/IntArray?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(vararg p: R|ft<kotlin/IntArray, kotlin/IntArray?>|): R|kotlin/Unit|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.fir.txt
index 3d6eb27c1e6..0e7be06b7fa 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.fir.txt
@@ -1,2 +1,18 @@
 public abstract interface Kt3302 : R|kotlin/Any| {
+    public abstract interface BSONObject : R|kotlin/Any| {
+        public abstract fun put(@R|org/jetbrains/annotations/NotNull|() s: R|@EnhancedNullability kotlin/String|, @R|org/jetbrains/annotations/NotNull|() o: R|@EnhancedNullability kotlin/Any|): R|ft<kotlin/Any, kotlin/Any?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
+    public abstract interface BasicBSONObject : R|test/Kt3302.LinkedHashMap<ft<kotlin/String, kotlin/String?>, ft<kotlin/Any, kotlin/Any?>>|, R|test/Kt3302.BSONObject| {
+        @R|java/lang/Override|() public abstract fun put(key: R|ft<kotlin/String, kotlin/String?>|, value: R|ft<kotlin/Any, kotlin/Any?>|): R|ft<kotlin/Any, kotlin/Any?>|
+
+    }
+    public abstract interface LinkedHashMap<K : R|ft<kotlin/Any, kotlin/Any?>|, V : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public abstract fun put(key: R|ft<K, K?>|, value: R|ft<V, V?>|): R|ft<V, V?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.fir.txt
index d4a6ae1f7f6..10f158f5790 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface MutableToReadOnly : R|kotlin/Any| {
+    public abstract interface Sub : R|test/MutableToReadOnly.Super| {
+        public abstract fun foo(p: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(p: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.fir.txt
index e686c9283df..03771002b7f 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface NotNullToNullable : R|kotlin/Any| {
+    public abstract interface Sub : R|test/NotNullToNullable.Super| {
+        public abstract fun foo(p: R|@EnhancedNullability kotlin/String|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(@R|org/jetbrains/annotations/NotNull|() p: R|@EnhancedNullability kotlin/String|): R|kotlin/Unit|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.fir.txt
index a5fe741c51f..cc5a104407d 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface NullableToNotNull : R|kotlin/Any| {
+    public abstract interface Sub : R|test/NullableToNotNull.Super| {
+        public abstract fun foo(@R|org/jetbrains/annotations/NotNull|() p: R|@EnhancedNullability kotlin/String|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(p: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.fir.txt
index 88d1947a610..56b180eee58 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface NullableToNotNullKotlinSignature : R|kotlin/Any| {
+    public abstract interface Sub : R|test/NullableToNotNullKotlinSignature.Super| {
+        public abstract fun foo(p: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(p: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.fir.txt
index 2eb8310dff6..6268364ccf9 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface OverrideWithErasedParameter : R|kotlin/Any| {
+    public abstract interface Sub<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/OverrideWithErasedParameter.Super<ft<T, T?>>| {
+        public abstract fun foo(o: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public abstract fun foo(t: R|ft<T, T?>|): R|kotlin/Unit|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.fir.txt
index 34ace1dcf02..48126c9b39e 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface ReadOnlyToMutable : R|kotlin/Any| {
+    public abstract interface Sub : R|test/ReadOnlyToMutable.Super| {
+        public abstract fun foo(p: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(p: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.fir.txt
index cd36b3ddcc1..8c7c53e8d3f 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.fir.txt
@@ -1,2 +1,18 @@
 public abstract interface SubclassFromGenericAndNot : R|kotlin/Any| {
+    public abstract interface Generic<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public abstract fun foo(key: R|ft<T, T?>|): R|kotlin/Unit|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
+    public abstract interface NonGeneric : R|kotlin/Any| {
+        public abstract fun foo(@R|org/jetbrains/annotations/NotNull|() s: R|@EnhancedNullability kotlin/String|): R|kotlin/Unit|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
+    public abstract interface Sub : R|test/SubclassFromGenericAndNot.NonGeneric|, R|test/SubclassFromGenericAndNot.Generic<ft<kotlin/String, kotlin/String?>>| {
+        @R|java/lang/Override|() public abstract fun foo(key: R|@EnhancedNullability kotlin/String|): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.fir.txt
index c21c2e539c4..345cde191b5 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface SubstitutedClassParameter : R|kotlin/Any| {
+    public abstract interface Sub : R|test/SubstitutedClassParameter.Super<ft<kotlin/String, kotlin/String?>>| {
+        public abstract fun foo(p: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public abstract fun foo(p: R|ft<T, T?>|): R|kotlin/Unit|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.fir.txt
index f4b865d27dc..4c7a0e9540b 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.fir.txt
@@ -1,2 +1,18 @@
 public abstract interface SubstitutedClassParameters : R|kotlin/Any| {
+    public abstract interface Sub : R|test/SubstitutedClassParameters.Super1<ft<kotlin/String, kotlin/String?>>|, R|test/SubstitutedClassParameters.Super2<ft<kotlin/String, kotlin/String?>>| {
+        public abstract fun foo(p: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super1<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public abstract fun foo(p: R|ft<T, T?>|): R|kotlin/Unit|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
+    public abstract interface Super2<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public abstract fun foo(p: R|ft<E, E?>|): R|kotlin/Unit|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.fir.txt
index a35bfdb3ffb..5b371039204 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface AddNotNullJavaSubtype : R|kotlin/Any| {
+    public abstract interface Sub : R|test/AddNotNullJavaSubtype.Super| {
+        @R|org/jetbrains/annotations/NotNull|() public abstract fun foo(): R|@EnhancedNullability kotlin/String|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<kotlin/CharSequence, kotlin/CharSequence?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.fir.txt
index 9a3c6fb92cd..14fe098af49 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface AddNotNullSameJavaType : R|kotlin/Any| {
+    public abstract interface Sub : R|test/AddNotNullSameJavaType.Super| {
+        @R|org/jetbrains/annotations/NotNull|() public abstract fun foo(): R|@EnhancedNullability kotlin/CharSequence|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<kotlin/CharSequence, kotlin/CharSequence?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.fir.txt
index 51f24785871..4740cd4774c 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface AddNullabilityJavaSubtype : R|kotlin/Any| {
+    public abstract interface Sub : R|test/AddNullabilityJavaSubtype.Super| {
+        public abstract fun foo(): R|@EnhancedNullability kotlin/String|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        @R|org/jetbrains/annotations/NotNull|() public abstract fun foo(): R|@EnhancedNullability kotlin/CharSequence|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.fir.txt
index ea31e5d1f06..b75c6c7f53c 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface AddNullabilitySameGenericType1 : R|kotlin/Any| {
+    public abstract interface Sub : R|test/AddNullabilitySameGenericType1.Super| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.fir.txt
index 09bb119a1a8..0165509fbbd 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface AddNullabilitySameGenericType2 : R|kotlin/Any| {
+    public abstract interface Sub : R|test/AddNullabilitySameGenericType2.Super| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.fir.txt
index 0e5870f0b9c..25503610691 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface AddNullabilitySameJavaType : R|kotlin/Any| {
+    public abstract interface Sub : R|test/AddNullabilitySameJavaType.Super| {
+        public abstract fun foo(): R|@EnhancedNullability kotlin/CharSequence|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        @R|org/jetbrains/annotations/NotNull|() public abstract fun foo(): R|@EnhancedNullability kotlin/CharSequence|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.fir.txt
index 215a2f05e37..bac45ff864b 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface CantMakeImmutableInSubclass : R|kotlin/Any| {
+    public abstract interface Sub : R|test/CantMakeImmutableInSubclass.Super| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<ft<kotlin/String, kotlin/String?>>, kotlin/collections/Collection<ft<kotlin/String, kotlin/String?>>?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.fir.txt
index f7fca4cd27b..835e00d92d1 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.fir.txt
@@ -1,2 +1,16 @@
 public abstract interface DeeplySubstitutedClassParameter : R|kotlin/Any| {
+    public abstract interface Middle<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/DeeplySubstitutedClassParameter.Super<ft<E, E?>>| {
+        public abstract fun foo(): R|ft<E, E?>|
+
+    }
+    public abstract interface Sub : R|test/DeeplySubstitutedClassParameter.Middle<ft<kotlin/String, kotlin/String?>>| {
+        public abstract fun foo(): R|ft<kotlin/String, kotlin/String?>|
+
+    }
+    public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<T, T?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.fir.txt
index 38ce7269fc5..dbaa02563f0 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.fir.txt
@@ -1,2 +1,14 @@
 public abstract interface DeeplySubstitutedClassParameter2 : R|kotlin/Any| {
+    public abstract interface Middle<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/DeeplySubstitutedClassParameter2.Super<ft<E, E?>>| {
+    }
+    public abstract interface Sub : R|test/DeeplySubstitutedClassParameter2.Middle<ft<kotlin/String, kotlin/String?>>| {
+        public abstract fun foo(): R|ft<kotlin/String, kotlin/String?>|
+
+    }
+    public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<T, T?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.fir.txt
index 6461b4a7e52..22850f95218 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.fir.txt
@@ -1,2 +1,14 @@
 public abstract interface HalfSubstitutedTypeParameters : R|kotlin/Any| {
+    public abstract interface Sub : R|test/HalfSubstitutedTypeParameters.Super| {
+        public abstract fun foo(): R|ft<test/HalfSubstitutedTypeParameters.TrickyList<ft<kotlin/Int, kotlin/Int?>, ft<kotlin/String, kotlin/String?>>, test/HalfSubstitutedTypeParameters.TrickyList<ft<kotlin/Int, kotlin/Int?>, ft<kotlin/String, kotlin/String?>>?>|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
+    public abstract interface TrickyList<X : R|ft<kotlin/Any, kotlin/Any?>|, E : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/collections/MutableList<ft<E, E?>>| {
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.fir.txt
index 7d3b3ce0779..19ff717d815 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface InheritNullabilityGenericSubclassSimple : R|kotlin/Any| {
+    public abstract interface Sub : R|test/InheritNullabilityGenericSubclassSimple.Super| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<ft<kotlin/String, kotlin/String?>>, kotlin/collections/Collection<ft<kotlin/String, kotlin/String?>>?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.fir.txt
index 6f6e51aac65..3ae4134b2c2 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface InheritNullabilityJavaSubtype : R|kotlin/Any| {
+    public abstract interface Sub : R|test/InheritNullabilityJavaSubtype.Super| {
+        public abstract fun foo(): R|@EnhancedNullability kotlin/String|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        @R|org/jetbrains/annotations/NotNull|() public abstract fun foo(): R|@EnhancedNullability kotlin/CharSequence|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.fir.txt
index cc52e52a1c2..9033048fbc8 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface InheritNullabilitySameGenericType : R|kotlin/Any| {
+    public abstract interface Sub : R|test/InheritNullabilitySameGenericType.Super| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.fir.txt
index efba5445553..495c32a1be6 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface InheritNullabilitySameJavaType : R|kotlin/Any| {
+    public abstract interface Sub : R|test/InheritNullabilitySameJavaType.Super| {
+        public abstract fun foo(): R|@EnhancedNullability kotlin/CharSequence|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        @R|org/jetbrains/annotations/NotNull|() public abstract fun foo(): R|@EnhancedNullability kotlin/CharSequence|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritProjectionKind.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritProjectionKind.fir.txt
index e48cbd30720..a09cfddba19 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritProjectionKind.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritProjectionKind.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface InheritProjectionKind : R|kotlin/Any| {
+    public abstract interface Sub : R|test/InheritProjectionKind.Super| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/Number, kotlin/Number?>>, kotlin/collections/List<ft<kotlin/Number, kotlin/Number?>>?>|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<ft<kotlin/Number, kotlin/Number?>>, kotlin/collections/Collection<ft<kotlin/Number, kotlin/Number?>>?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.fir.txt
index 865aed62bf9..abfc4fba850 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface InheritReadOnlinessOfArgument : R|kotlin/Any| {
+    public abstract interface Sub : R|test/InheritReadOnlinessOfArgument.Super| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.fir.txt
index d716255439f..317527a984a 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface InheritReadOnlinessSameClass : R|kotlin/Any| {
+    public abstract interface Sub : R|test/InheritReadOnlinessSameClass.Super| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.fir.txt
index ab826d68ff4..8f078ecfefd 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface InheritReadOnlinessSubclass : R|kotlin/Any| {
+    public abstract interface Sub : R|test/InheritReadOnlinessSubclass.Super| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<ft<kotlin/String, kotlin/String?>>, kotlin/collections/Collection<ft<kotlin/String, kotlin/String?>>?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SameProjectionKind.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SameProjectionKind.fir.txt
index a733540fee6..a65aa162041 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SameProjectionKind.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SameProjectionKind.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface SameProjectionKind : R|kotlin/Any| {
+    public abstract interface Sub : R|test/SameProjectionKind.Super| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<out ft<kotlin/Number, kotlin/Number?>>, kotlin/collections/Collection<out ft<kotlin/Number, kotlin/Number?>>?>|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<out ft<kotlin/Number, kotlin/Number?>>, kotlin/collections/Collection<out ft<kotlin/Number, kotlin/Number?>>?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.fir.txt
index cd36b3ddcc1..a505021dfee 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.fir.txt
@@ -1,2 +1,18 @@
 public abstract interface SubclassFromGenericAndNot : R|kotlin/Any| {
+    public abstract interface Generic<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<T, T?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
+    public abstract interface NonGeneric : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<kotlin/String, kotlin/String?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
+    public abstract interface Sub : R|test/SubclassFromGenericAndNot.NonGeneric|, R|test/SubclassFromGenericAndNot.Generic<ft<kotlin/String, kotlin/String?>>| {
+        @R|java/lang/Override|() public abstract fun foo(): R|ft<kotlin/String, kotlin/String?>|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameter.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameter.fir.txt
index c21c2e539c4..b17a5722804 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameter.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface SubstitutedClassParameter : R|kotlin/Any| {
+    public abstract interface Sub : R|test/SubstitutedClassParameter.Super<ft<kotlin/String, kotlin/String?>>| {
+        public abstract fun foo(): R|ft<kotlin/String, kotlin/String?>|
+
+    }
+    public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<T, T?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameters.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameters.fir.txt
index f4b865d27dc..c131a608659 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameters.fir.txt
@@ -1,2 +1,18 @@
 public abstract interface SubstitutedClassParameters : R|kotlin/Any| {
+    public abstract interface Sub : R|test/SubstitutedClassParameters.Super1<ft<kotlin/String, kotlin/String?>>|, R|test/SubstitutedClassParameters.Super2<ft<kotlin/String, kotlin/String?>>| {
+        public abstract fun foo(): R|ft<kotlin/String, kotlin/String?>|
+
+    }
+    public abstract interface Super1<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<T, T?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
+    public abstract interface Super2<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<E, E?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.fir.txt
index 31ac4d2bd41..0bbe83b3c04 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.fir.txt
@@ -1,2 +1,18 @@
 public abstract interface TwoSuperclassesConflictingProjectionKinds : R|kotlin/Any| {
+    public abstract interface Sub : R|test/TwoSuperclassesConflictingProjectionKinds.Super1|, R|test/TwoSuperclassesConflictingProjectionKinds.Super2| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<ft<kotlin/CharSequence, kotlin/CharSequence?>>, kotlin/collections/Collection<ft<kotlin/CharSequence, kotlin/CharSequence?>>?>|
+
+    }
+    public abstract interface Super1 : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<ft<kotlin/CharSequence, kotlin/CharSequence?>>, kotlin/collections/Collection<ft<kotlin/CharSequence, kotlin/CharSequence?>>?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
+    public abstract interface Super2 : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<ft<kotlin/CharSequence, kotlin/CharSequence?>>, kotlin/collections/Collection<ft<kotlin/CharSequence, kotlin/CharSequence?>>?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.fir.txt
index 6614172e3f4..b76b0d9c6ec 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.fir.txt
@@ -1,2 +1,18 @@
 public abstract interface TwoSuperclassesInvariantAndCovariantInferMutability : R|kotlin/Any| {
+    public abstract interface Sub : R|test/TwoSuperclassesInvariantAndCovariantInferMutability.Super1|, R|test/TwoSuperclassesInvariantAndCovariantInferMutability.Super2| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|
+
+    }
+    public abstract interface Super1 : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
+    public abstract interface Super2 : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.fir.txt
index 1b99a879765..70421f4a078 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.fir.txt
@@ -1,2 +1,18 @@
 public abstract interface TwoSuperclassesInvariantAndCovariantInferNullability : R|kotlin/Any| {
+    public abstract interface Sub : R|test/TwoSuperclassesInvariantAndCovariantInferNullability.Super1|, R|test/TwoSuperclassesInvariantAndCovariantInferNullability.Super2| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+
+    }
+    public abstract interface Super1 : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
+    public abstract interface Super2 : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.fir.txt
index 0deb7ed8c65..650c9a23c8e 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.fir.txt
@@ -1,2 +1,18 @@
 public abstract interface TwoSuperclassesMutableAndNot : R|kotlin/Any| {
+    public abstract interface Sub : R|test/TwoSuperclassesMutableAndNot.Super1|, R|test/TwoSuperclassesMutableAndNot.Super2| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+
+    }
+    public abstract interface Super1 : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableCollection<ft<kotlin/String, kotlin/String?>>, kotlin/collections/Collection<ft<kotlin/String, kotlin/String?>>?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
+    public abstract interface Super2 : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.fir.txt
index fb0a5205500..0c3cfbe28d5 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.fir.txt
@@ -1,2 +1,18 @@
 public abstract interface TwoSuperclassesReturnJavaSubtype : R|kotlin/Any| {
+    public abstract interface Sub : R|test/TwoSuperclassesReturnJavaSubtype.Super1|, R|test/TwoSuperclassesReturnJavaSubtype.Super2| {
+        public abstract fun foo(): R|@EnhancedNullability kotlin/String|
+
+    }
+    public abstract interface Super1 : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<kotlin/CharSequence, kotlin/CharSequence?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
+    public abstract interface Super2 : R|kotlin/Any| {
+        @R|org/jetbrains/annotations/NotNull|() public abstract fun foo(): R|@EnhancedNullability kotlin/CharSequence|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.fir.txt
index a2d0b73d3f4..fd994e09426 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.fir.txt
@@ -1,2 +1,18 @@
 public abstract interface TwoSuperclassesReturnSameJavaType : R|kotlin/Any| {
+    public abstract interface Sub : R|test/TwoSuperclassesReturnSameJavaType.Super1|, R|test/TwoSuperclassesReturnSameJavaType.Super2| {
+        public abstract fun foo(): R|@EnhancedNullability kotlin/CharSequence|
+
+    }
+    public abstract interface Super1 : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<kotlin/CharSequence, kotlin/CharSequence?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
+    public abstract interface Super2 : R|kotlin/Any| {
+        @R|org/jetbrains/annotations/NotNull|() public abstract fun foo(): R|@EnhancedNullability kotlin/CharSequence|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.fir.txt
index 4d17d09d783..2679c0c5e5a 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.fir.txt
@@ -1,2 +1,18 @@
 public abstract interface TwoSuperclassesSupplementNotNull : R|kotlin/Any| {
+    public abstract interface Sub : R|test/TwoSuperclassesSupplementNotNull.Super1|, R|test/TwoSuperclassesSupplementNotNull.Super2| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+
+    }
+    public abstract interface Super1 : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
+    public abstract interface Super2 : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.fir.txt
index 6f2bb0dc532..c0275ecaabb 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface TypeParamOfClass : R|kotlin/Any| {
+    public abstract interface Sub<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/TypeParamOfClass.Super<ft<T, T?>>| {
+        public abstract fun foo(): R|@EnhancedNullability T|
+
+    }
+    public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        @R|org/jetbrains/annotations/NotNull|() public abstract fun foo(): R|@EnhancedNullability T!!|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.fir.txt
index 68e4b74d343..a875be1fa4a 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface TypeParamOfClassSubstituted : R|kotlin/Any| {
+    public abstract interface Sub : R|test/TypeParamOfClassSubstituted.Super<ft<kotlin/String, kotlin/String?>>| {
+        public abstract fun foo(): R|@EnhancedNullability kotlin/String|
+
+    }
+    public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        @R|org/jetbrains/annotations/NotNull|() public abstract fun foo(): R|@EnhancedNullability T!!|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.fir.txt
index 5345d8ebf0d..dcb31b63b56 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface TypeParamOfFun : R|kotlin/Any| {
+    public abstract interface Sub : R|test/TypeParamOfFun.Super| {
+        public abstract fun <E : R|ft<kotlin/Any, kotlin/Any?>|> foo(): R|@EnhancedNullability E!!|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        @R|org/jetbrains/annotations/NotNull|() public abstract fun <T : R|ft<kotlin/Any, kotlin/Any?>|> foo(): R|@EnhancedNullability T!!|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.fir.txt
index 3e550e5a48f..894eb81fa56 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.fir.txt
@@ -1,2 +1,10 @@
 public abstract interface InheritNullability : R|kotlin/Any| {
+    public abstract interface Sub : R|test/InheritNullability.Super| {
+        public abstract fun <B : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> foo(b: R|ft<B, B?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun <A : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> foo(a: R|ft<A, A?>|): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.fir.txt
index b3b89d3f6f3..5f1feca2000 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.fir.txt
@@ -1,2 +1,10 @@
 public abstract interface TwoBounds : R|kotlin/Any| {
+    public abstract interface Sub : R|test/TwoBounds.Super| {
+        public abstract fun <B : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|, R|ft<kotlin/Cloneable, kotlin/Cloneable?>|> foo(b: R|ft<B, B?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun <A : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|, R|ft<kotlin/Cloneable, kotlin/Cloneable?>|> foo(a: R|ft<A, A?>|): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.fir.txt
index 2185f42dec7..72e6bf4b091 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.fir.txt
@@ -1,2 +1,14 @@
 public abstract interface TwoSuperclasses : R|kotlin/Any| {
+    public abstract interface Sub : R|test/TwoSuperclasses.Super1|, R|test/TwoSuperclasses.Super2| {
+        public abstract fun <C : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> foo(c: R|ft<C, C?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super1 : R|kotlin/Any| {
+        public abstract fun <A : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> foo(a: R|ft<A, A?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super2 : R|kotlin/Any| {
+        public abstract fun <B : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> foo(a: R|ft<B, B?>|): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.fir.txt
index 5ca02f3bdfa..7c026169a19 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.fir.txt
@@ -1,2 +1,10 @@
 public abstract interface TwoTypeParameters : R|kotlin/Any| {
+    public abstract interface Sub : R|test/TwoTypeParameters.Super| {
+        public abstract fun <B : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|, A : R|ft<kotlin/Cloneable, kotlin/Cloneable?>|> foo(b: R|ft<B, B?>|, a: R|ft<A, A?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun <A : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|, B : R|ft<kotlin/Cloneable, kotlin/Cloneable?>|> foo(a: R|ft<A, A?>|, b: R|ft<B, B?>|): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.fir.txt
index b6481dd5d03..5e123cf946d 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface UseParameterAsUpperBound : R|kotlin/Any| {
+    public abstract interface Sub : R|test/UseParameterAsUpperBound.Super| {
+        public abstract fun <B : R|ft<kotlin/Any, kotlin/Any?>|, A : R|ft<B, B?>|> foo(b: R|ft<B, B?>|, a: R|ft<A, A?>|): R|kotlin/Unit|
+
+        public abstract fun <A : R|ft<kotlin/Any, kotlin/Any?>|, B : R|ft<A, A?>|> foo(a: R|ft<A, A?>|, b: R|ft<B, B?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun <A : R|ft<kotlin/Any, kotlin/Any?>|, B : R|ft<A, A?>|> foo(a: R|ft<A, A?>|, b: R|ft<B, B?>|): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.fir.txt
index 5ca09609269..3e1e4d0746e 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.fir.txt
@@ -1,2 +1,10 @@
 public abstract interface UseParameterInUpperBound : R|kotlin/Any| {
+    public abstract interface Sub : R|test/UseParameterInUpperBound.Super| {
+        public abstract fun <B : R|ft<kotlin/Any, kotlin/Any?>|, A : R|ft<kotlin/collections/MutableList<ft<B, B?>>, kotlin/collections/List<ft<B, B?>>?>|> foo(b: R|ft<B, B?>|, a: R|ft<A, A?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun <A : R|ft<kotlin/Any, kotlin/Any?>|, B : R|ft<kotlin/collections/MutableList<ft<A, A?>>, kotlin/collections/List<ft<A, A?>>?>|> foo(a: R|ft<A, A?>|, b: R|ft<B, B?>|): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.fir.txt
index 5139b6b9957..7228c4d50d2 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.fir.txt
@@ -1,2 +1,10 @@
 public abstract interface UseParameterInUpperBoundWithKotlinSignature : R|kotlin/Any| {
+    public abstract interface Sub : R|test/UseParameterInUpperBoundWithKotlinSignature.Super| {
+        public abstract fun <B : R|ft<kotlin/Any, kotlin/Any?>|, A : R|ft<kotlin/collections/MutableList<ft<B, B?>>, kotlin/collections/List<ft<B, B?>>?>|> foo(b: R|ft<B, B?>|, a: R|ft<A, A?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun <A : R|ft<kotlin/Any, kotlin/Any?>|, B : R|ft<kotlin/collections/MutableList<ft<A, A?>>, kotlin/collections/List<ft<A, A?>>?>|> foo(a: R|ft<A, A?>|, b: R|ft<B, B?>|): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.fir.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.fir.txt
index 0c4c3c19312..df9934dae7e 100644
--- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.fir.txt
@@ -1,2 +1,24 @@
 public abstract interface LoadIterableWithPropagation : R|kotlin/Any| {
+    public abstract interface LoadIterable<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/MutableIterable<ft<T, T?>>?>|
+
+        public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/MutableIterable<ft<T, T?>>?>|): R|kotlin/Unit|
+
+        @R|kotlin/annotations/jvm/ReadOnly|() public abstract fun getReadOnlyIterable(): R|ft<kotlin/collections/Iterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>?>|
+
+        public abstract fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() Iterable: R|ft<kotlin/collections/Iterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>?>|): R|kotlin/Unit|
+
+    }
+    public open class LoadIterableImpl<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any|, R|test/LoadIterableWithPropagation.LoadIterable<ft<T, T?>>| {
+        public open fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/MutableIterable<ft<T, T?>>?>|
+
+        public open fun setIterable(Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>>, kotlin/collections/MutableIterable<ft<T, T?>>?>|): R|kotlin/Unit|
+
+        public open fun getReadOnlyIterable(): R|ft<kotlin/collections/Iterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>?>|
+
+        public open fun setReadOnlyIterable(Iterable: R|ft<kotlin/collections/Iterable<ft<T, T?>>, kotlin/collections/Iterable<ft<T, T?>>?>|): R|kotlin/Unit|
+
+        public constructor<T : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/LoadIterableWithPropagation.LoadIterableImpl<T>|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageConstructor.fir.txt b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageConstructor.fir.txt
index ac1664544bf..ed4e46f60ef 100644
--- a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageConstructor.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageConstructor.fir.txt
@@ -1,4 +1,8 @@
 public open class ProtectedPackageConstructor : R|kotlin/Any| {
     public constructor(): R|test/ProtectedPackageConstructor|
 
+    protected/*protected static*/ open class Foo : R|kotlin/Any| {
+        protected/*protected static*/ constructor(): R|test/ProtectedPackageConstructor.Foo|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/protectedStatic/ConstructorInProtectedStaticNestedClass.fir.txt b/compiler/testData/loadJava/compiledJava/protectedStatic/ConstructorInProtectedStaticNestedClass.fir.txt
index 4902ea8cf33..3f79762549b 100644
--- a/compiler/testData/loadJava/compiledJava/protectedStatic/ConstructorInProtectedStaticNestedClass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/protectedStatic/ConstructorInProtectedStaticNestedClass.fir.txt
@@ -1,4 +1,8 @@
 public open class ConstructorInProtectedStaticNestedClass : R|kotlin/Any| {
     public constructor(): R|test/ConstructorInProtectedStaticNestedClass|
 
+    protected/*protected static*/ open class Inner : R|kotlin/Any| {
+        protected/*protected static*/ constructor(): R|test/ConstructorInProtectedStaticNestedClass.Inner|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/rendering/Rendering.fir.txt b/compiler/testData/loadJava/compiledJava/rendering/Rendering.fir.txt
index 1417c3a236a..7dcb59d0fbf 100644
--- a/compiler/testData/loadJava/compiledJava/rendering/Rendering.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/rendering/Rendering.fir.txt
@@ -1,4 +1,72 @@
 public open class Rendering : R|kotlin/Any| {
     public constructor(): R|test/Rendering|
 
+    public/*package*/ open inner class A_Plain : R|kotlin/Any| {
+        public/*package*/ constructor(): R|test/Rendering.A_Plain|
+
+    }
+    public/*package*/ open inner class B_Super : R|kotlin/Any| {
+        public/*package*/ constructor(): R|test/Rendering.B_Super|
+
+    }
+    public/*package*/ open inner class C_Sub : R|test/Rendering.B_Super| {
+        public/*package*/ constructor(): R|test/Rendering.C_Sub|
+
+    }
+    public/*package*/ open inner class D_SuperG<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public/*package*/ constructor<T : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/Rendering.D_SuperG<T>|
+
+    }
+    public/*package*/ open inner class E_SubG : R|test/Rendering.D_SuperG<ft<kotlin/String, kotlin/String?>>| {
+        public/*package*/ constructor(): R|test/Rendering.E_SubG|
+
+    }
+    public/*package*/ abstract interface F_Array : R|kotlin/Any| {
+        public abstract fun foo1(strings: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+
+        public abstract fun foo2(strings: R|ft<kotlin/Array<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/Array<out ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|): R|kotlin/Unit|
+
+        public abstract fun foo3(vararg args: R|ft<kotlin/Array<ft<kotlin/Int, kotlin/Int?>>, kotlin/Array<out ft<kotlin/Int, kotlin/Int?>>?>|): R|kotlin/Unit|
+
+        public abstract fun foo4(vararg args: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+
+        public abstract fun foo5(vararg args: R|ft<kotlin/Array<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/Array<out ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|): R|kotlin/Unit|
+
+    }
+    public/*package*/ abstract interface G_Collections : R|kotlin/Any| {
+        public abstract fun foo1(x: R|ft<kotlin/collections/MutableIterator<ft<kotlin/String, kotlin/String?>>, kotlin/collections/Iterator<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+
+        public abstract fun foo2(x: R|ft<kotlin/collections/MutableIterable<ft<kotlin/String, kotlin/String?>>, kotlin/collections/Iterable<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+
+        public abstract fun foo3(x: R|ft<kotlin/collections/MutableCollection<ft<kotlin/String, kotlin/String?>>, kotlin/collections/Collection<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+
+        public abstract fun foo4(x: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+
+        public abstract fun foo5(x: R|ft<kotlin/collections/MutableSet<ft<kotlin/String, kotlin/String?>>, kotlin/collections/Set<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+
+        public abstract fun foo6(x: R|ft<kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+
+        public abstract fun foo7(x: R|ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+
+    }
+    public/*package*/ abstract interface H_Raw : R|kotlin/Any| {
+        public abstract fun foo1(x: R|ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>|): R|kotlin/Unit|
+
+        public abstract fun foo2(x: R|ft<test/Rendering.D_SuperG<ft<kotlin/Any, kotlin/Any?>>, test/Rendering.D_SuperG<*>?>|): R|kotlin/Unit|
+
+    }
+    public/*package*/ abstract interface I_Wildcard : R|kotlin/Any| {
+        public abstract fun foo1(x: R|ft<kotlin/collections/MutableList<out ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+
+        public abstract fun foo2(x: R|ft<kotlin/collections/MutableList<in ft<kotlin/String, kotlin/String?>>, kotlin/collections/MutableList<in ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+
+        public abstract fun foo3(x: R|ft<kotlin/collections/MutableList<*>, kotlin/collections/List<*>?>|): R|kotlin/Unit|
+
+        public abstract fun foo4(x: R|ft<test/Rendering.D_SuperG<out ft<kotlin/String, kotlin/String?>>, test/Rendering.D_SuperG<out ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+
+        public abstract fun foo5(x: R|ft<test/Rendering.D_SuperG<in ft<kotlin/String, kotlin/String?>>, test/Rendering.D_SuperG<in ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+
+        public abstract fun foo6(x: R|ft<test/Rendering.D_SuperG<*>, test/Rendering.D_SuperG<*>?>|): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/DifferentParametersCount.fir.txt b/compiler/testData/loadJava/compiledJava/sam/DifferentParametersCount.fir.txt
index 155be419fa8..f9f5ff95fad 100644
--- a/compiler/testData/loadJava/compiledJava/sam/DifferentParametersCount.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/DifferentParametersCount.fir.txt
@@ -1,4 +1,18 @@
 public final class DifferentParametersCount : R|kotlin/Any| {
     public constructor(): R|test/DifferentParametersCount|
 
+    public open class A : R|kotlin/Any| {
+        public open static fun foo(x: R|ft<java/lang/Runnable, java/lang/Runnable?>|, y: R|kotlin/Int|): R|kotlin/Unit|
+
+        public constructor(): R|test/DifferentParametersCount.A|
+
+    }
+    public open class B : R|test/DifferentParametersCount.A| {
+        public open static fun foo(x: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+
+        public open static fun foo(x: R|ft<java/lang/Runnable, java/lang/Runnable?>|, y: R|kotlin/Int|): R|kotlin/Unit|
+
+        public constructor(): R|test/DifferentParametersCount.B|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/FakeStaticOverrides.fir.txt b/compiler/testData/loadJava/compiledJava/sam/FakeStaticOverrides.fir.txt
index c14952ba482..b9a1e9f1a59 100644
--- a/compiler/testData/loadJava/compiledJava/sam/FakeStaticOverrides.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/FakeStaticOverrides.fir.txt
@@ -1,4 +1,22 @@
 public final class FakeStaticOverrides : R|kotlin/Any| {
     public constructor(): R|test/FakeStaticOverrides|
 
+    public open class A : R|kotlin/Any| {
+        public open static fun foo(x: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
+
+        public constructor(): R|test/FakeStaticOverrides.A|
+
+    }
+    public open class B : R|test/FakeStaticOverrides.A| {
+        public open static fun foo(x: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+
+        public open static fun foo(x: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
+
+        public constructor(): R|test/FakeStaticOverrides.B|
+
+    }
+    public open class C : R|test/FakeStaticOverrides.B| {
+        public constructor(): R|test/FakeStaticOverrides.C|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/Nested.fir.txt b/compiler/testData/loadJava/compiledJava/sam/Nested.fir.txt
index 96f588a5562..1ec71998347 100644
--- a/compiler/testData/loadJava/compiledJava/sam/Nested.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/Nested.fir.txt
@@ -1,2 +1,20 @@
 public abstract interface Nested : R|kotlin/Any| {
+    public abstract interface Deeper1 : R|kotlin/Any| {
+        public abstract interface Runnable : R|kotlin/Any| {
+            public abstract fun run(): R|kotlin/Unit|
+
+            public abstract fun run2(): R|kotlin/Unit|
+
+        }
+    }
+    public abstract interface Deeper2 : R|kotlin/Any| {
+        public abstract interface Runnable : R|kotlin/Any| {
+            public abstract fun run(): R|kotlin/Unit|
+
+        }
+    }
+    public abstract interface Runnable : R|kotlin/Any| {
+        public abstract fun run(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.fir.txt b/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.fir.txt
index 5f5247ead7e..0724a10f474 100644
--- a/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface SamSubinterfaceOfTwo : R|kotlin/Any| {
+    public abstract interface Sub : R|test/SamSubinterfaceOfTwo.Super1|, R|test/SamSubinterfaceOfTwo.Super2<ft<kotlin/String, kotlin/String?>>| {
+    }
+    public abstract interface Super1 : R|kotlin/Any| {
+        public abstract fun f(): R|ft<kotlin/CharSequence, kotlin/CharSequence?>|
+
+    }
+    public abstract interface Super2<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public abstract fun f(): R|ft<T, T?>|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/StaticOverrides.fir.txt b/compiler/testData/loadJava/compiledJava/sam/StaticOverrides.fir.txt
index d9a364824c4..813dd324a87 100644
--- a/compiler/testData/loadJava/compiledJava/sam/StaticOverrides.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/StaticOverrides.fir.txt
@@ -1,4 +1,18 @@
 public final class StaticOverrides : R|kotlin/Any| {
     public constructor(): R|test/StaticOverrides|
 
+    public open class A : R|kotlin/Any| {
+        public open static fun foo(x: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
+
+        public constructor(): R|test/StaticOverrides.A|
+
+    }
+    public open class B : R|test/StaticOverrides.A| {
+        public open static fun foo(x: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+
+        public open static fun foo(x: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
+
+        public constructor(): R|test/StaticOverrides.B|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.fir.txt
index fd8dd7b1762..f763a842a0b 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.fir.txt
@@ -1,2 +1,10 @@
 public abstract interface DeepSamLoop : R|kotlin/Any| {
+    public abstract interface Bar : R|kotlin/Any| {
+        public abstract fun foo(p: R|ft<test/DeepSamLoop.Foo, test/DeepSamLoop.Foo?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Foo : R|kotlin/Any| {
+        public abstract fun foo(p: R|ft<test/DeepSamLoop.Bar, test/DeepSamLoop.Bar?>|): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt
index b2eb5d83a6f..496cd3477f9 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt
@@ -3,4 +3,8 @@ public open class PrivateSamAdapter : R|kotlin/Any| {
 
     public constructor(): R|test/PrivateSamAdapter|
 
+    private abstract interface SamInterface : R|kotlin/Any| {
+        public abstract fun foo(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt
index c7a1a7a9db6..4f358afbb66 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt
@@ -1,4 +1,10 @@
 public open class TypeParameterOfOuterClass<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
     public constructor<T : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/TypeParameterOfOuterClass<T>|
 
+    public open inner class Inner<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public open fun foo(comparator: R|ft<java/util/Comparator<ft<T, T?>>, java/util/Comparator<ft<T, T?>>?>|): R|kotlin/Unit|
+
+        public constructor(): R|test/TypeParameterOfOuterClass.Inner<T>|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.fir.txt
index 662e1b78b08..66aa06d1dd6 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface AdapterDoesntOverrideDeclaration : R|kotlin/Any| {
+    public abstract interface Sub : R|test/AdapterDoesntOverrideDeclaration.Super| {
+        public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+
+        public abstract fun foo(r: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(r: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.fir.txt
index ef3581ca668..2e2e55392fb 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.fir.txt
@@ -1,2 +1,10 @@
 public abstract interface InheritedAdapterAndDeclaration : R|kotlin/Any| {
+    public abstract interface Sub : R|test/InheritedAdapterAndDeclaration.Super| {
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+
+        public abstract fun foo(r: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.fir.txt
index 48b94dc1ec3..aa80348d59f 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.fir.txt
@@ -1,2 +1,10 @@
 public abstract interface InheritedAmbiguousAdapters : R|kotlin/Any| {
+    public abstract interface Sub : R|test/InheritedAmbiguousAdapters.Super| {
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+
+        public abstract fun foo(r: R|ft<java/io/Closeable, java/io/Closeable?>|): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.fir.txt
index fd317a6f3df..ffc925e91b5 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.fir.txt
@@ -1,2 +1,14 @@
 public abstract interface InheritedAndOverriddenAmbiguousAdapters : R|kotlin/Any| {
+    public abstract interface Sub : R|test/InheritedAndOverriddenAmbiguousAdapters.Super| {
+        public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+
+        public abstract fun foo(r: R|ft<java/io/Closeable, java/io/Closeable?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+
+        public abstract fun foo(r: R|ft<java/io/Closeable, java/io/Closeable?>|): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.fir.txt
index f116a103d68..9ec8b0484ce 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.fir.txt
@@ -1,2 +1,14 @@
 public abstract interface InheritedOverridden : R|kotlin/Any| {
+    public open class Sub : R|test/InheritedOverridden.Super| {
+        public open fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+
+        public constructor(): R|test/InheritedOverridden.Sub|
+
+    }
+    public open class Super : R|kotlin/Any| {
+        public open fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+
+        public constructor(): R|test/InheritedOverridden.Super|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.fir.txt
index 8602202ca5b..907a58c7b16 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.fir.txt
@@ -1,2 +1,16 @@
 public abstract interface InheritedOverriddenAdapter : R|kotlin/Any| {
+    public open class Sub : R|test/InheritedOverriddenAdapter.Super| {
+        public open fun foo(r: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
+
+        public open fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+
+        public constructor(): R|test/InheritedOverriddenAdapter.Sub|
+
+    }
+    public open class Super : R|kotlin/Any| {
+        public open fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+
+        public constructor(): R|test/InheritedOverriddenAdapter.Super|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.fir.txt
index e4099e004a5..3ec92a0bf78 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface InheritedSameAdapters : R|kotlin/Any| {
+    public abstract interface Sub : R|test/InheritedSameAdapters.Super1|, R|test/InheritedSameAdapters.Super2| {
+    }
+    public abstract interface Super1 : R|kotlin/Any| {
+        public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super2 : R|kotlin/Any| {
+        public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.fir.txt
index c2114e2f471..50e37a62a84 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.fir.txt
@@ -1,2 +1,14 @@
 public abstract interface InheritedSameAdaptersWithSubstitution : R|kotlin/Any| {
+    public abstract interface Sub : R|test/InheritedSameAdaptersWithSubstitution.Super1|, R|test/InheritedSameAdaptersWithSubstitution.Super2Substituted| {
+    }
+    public abstract interface Super1 : R|kotlin/Any| {
+        public abstract fun foo(r: R|ft<java/util/Comparator<ft<kotlin/String, kotlin/String?>>, java/util/Comparator<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super2<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public abstract fun foo(r: R|ft<java/util/Comparator<ft<T, T?>>, java/util/Comparator<ft<T, T?>>?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super2Substituted : R|test/InheritedSameAdaptersWithSubstitution.Super2<ft<kotlin/String, kotlin/String?>>| {
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.fir.txt
index 57533da4714..8a29f2c0c12 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.fir.txt
@@ -1,2 +1,8 @@
 public abstract interface InheritedSimple : R|kotlin/Any| {
+    public abstract interface Sub : R|test/InheritedSimple.Super| {
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.fir.txt
index ca228f319af..382f94b20a3 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.fir.txt
@@ -1,2 +1,16 @@
 public abstract interface OverriddenAmbiguousAdapters : R|kotlin/Any| {
+    public abstract interface Sub : R|test/OverriddenAmbiguousAdapters.Super| {
+        public abstract fun foo(r: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
+
+        public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+
+        public abstract fun foo(r: R|ft<java/io/Closeable, java/io/Closeable?>|): R|kotlin/Unit|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
+
+        public abstract fun foo(r: R|ft<java/io/Closeable, java/io/Closeable?>|): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.fir.txt
index d394b21adec..2e58c260a5a 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.fir.txt
@@ -1,2 +1,18 @@
 public abstract interface ArraysInSubtypes : R|kotlin/Any| {
+    public abstract interface Sub<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/ArraysInSubtypes.Super| {
+        public abstract fun array(): R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>|
+
+        public abstract fun listOfArray(): R|ft<kotlin/collections/MutableList<out ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<out ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>>?>|
+
+        public abstract fun objArray(): R|ft<kotlin/Array<ft<T, T?>>, kotlin/Array<out ft<T, T?>>?>|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun array(): R|ft<kotlin/Array<ft<kotlin/CharSequence, kotlin/CharSequence?>>, kotlin/Array<out ft<kotlin/CharSequence, kotlin/CharSequence?>>?>|
+
+        public abstract fun listOfArray(): R|ft<kotlin/collections/MutableList<out ft<kotlin/Array<ft<kotlin/CharSequence, kotlin/CharSequence?>>, kotlin/Array<out ft<kotlin/CharSequence, kotlin/CharSequence?>>?>>, kotlin/collections/List<out ft<kotlin/Array<ft<kotlin/CharSequence, kotlin/CharSequence?>>, kotlin/Array<out ft<kotlin/CharSequence, kotlin/CharSequence?>>?>>?>|
+
+        public abstract fun objArray(): R|ft<kotlin/Array<ft<kotlin/Any, kotlin/Any?>>, kotlin/Array<out ft<kotlin/Any, kotlin/Any?>>?>|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.fir.txt
index 1631b4b0608..486c68ebcc0 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.fir.txt
@@ -1,2 +1,12 @@
 public abstract interface MethodTypeParameterErased : R|kotlin/Any| {
+    public abstract interface Bug<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public abstract fun <RET : R|ft<test/MethodTypeParameterErased.Bug<ft<T, T?>>, test/MethodTypeParameterErased.Bug<ft<T, T?>>?>|> save(): R|ft<RET, RET?>|
+
+    }
+    public open class SubBug : R|kotlin/Any|, R|test/MethodTypeParameterErased.Bug<ft<kotlin/Any, kotlin/Any?>>| {
+        public open fun save(): R|ft<test/MethodTypeParameterErased.SubBug, test/MethodTypeParameterErased.SubBug?>|
+
+        public constructor(): R|test/MethodTypeParameterErased.SubBug|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.fir.txt
index 95152838b50..c51b7551597 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.fir.txt
@@ -1,4 +1,18 @@
 public open class RawSuperType : R|kotlin/Any| {
     public constructor(): R|test/RawSuperType|
 
+    public open inner class Derived : R|kotlin/Any|, R|test/RawSuperType.Super<ft<kotlin/Any, kotlin/Any?>>| {
+        @R|java/lang/Override|() public open fun foo(o: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Unit|
+
+        @R|java/lang/Override|() public open fun dummy(): R|kotlin/Unit|
+
+        public constructor(): R|test/RawSuperType.Derived|
+
+    }
+    public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public abstract fun foo(t: R|ft<T, T?>|): R|kotlin/Unit|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithBound.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithBound.fir.txt
index 4a6ceb6190f..da19a5fb783 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithBound.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithBound.fir.txt
@@ -1,4 +1,22 @@
 public open class RawSuperTypeWithBound : R|kotlin/Any| {
     public constructor(): R|test/RawSuperTypeWithBound|
 
+    public abstract interface Bound : R|kotlin/Any| {
+    }
+    public open inner class Derived : R|kotlin/Any|, R|test/RawSuperTypeWithBound.Super<ft<test/RawSuperTypeWithBound.Bound, test/RawSuperTypeWithBound.Bound?>>| {
+        public open fun foo(o: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Unit|
+
+        @R|java/lang/Override|() public open fun foo(o: R|ft<test/RawSuperTypeWithBound.Bound, test/RawSuperTypeWithBound.Bound?>|): R|kotlin/Unit|
+
+        @R|java/lang/Override|() public open fun dummy(): R|kotlin/Unit|
+
+        public constructor(): R|test/RawSuperTypeWithBound.Derived|
+
+    }
+    public abstract interface Super<T : R|ft<test/RawSuperTypeWithBound.Bound, test/RawSuperTypeWithBound.Bound?>|> : R|kotlin/Any| {
+        public abstract fun foo(t: R|ft<T, T?>|): R|kotlin/Unit|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBound.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBound.fir.txt
index 094b75ee727..8e962327240 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBound.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBound.fir.txt
@@ -1,4 +1,20 @@
 public open class RawSuperTypeWithRecursiveBound : R|kotlin/Any| {
     public constructor(): R|test/RawSuperTypeWithRecursiveBound|
 
+    public open inner class Derived : R|kotlin/Any|, R|test/RawSuperTypeWithRecursiveBound.Super<ft<test/RawSuperTypeWithRecursiveBound.Super<*>, test/RawSuperTypeWithRecursiveBound.Super<*>?>>| {
+        public open fun foo(o: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Unit|
+
+        @R|java/lang/Override|() public open fun foo(o: R|ft<test/RawSuperTypeWithRecursiveBound.Super<ft<test/RawSuperTypeWithRecursiveBound.Super<*>, test/RawSuperTypeWithRecursiveBound.Super<*>?>>, test/RawSuperTypeWithRecursiveBound.Super<*>?>|): R|kotlin/Unit|
+
+        @R|java/lang/Override|() public open fun dummy(): R|kotlin/Unit|
+
+        public constructor(): R|test/RawSuperTypeWithRecursiveBound.Derived|
+
+    }
+    public abstract interface Super<T : R|ft<test/RawSuperTypeWithRecursiveBound.Super<ft<T, T?>>, test/RawSuperTypeWithRecursiveBound.Super<ft<T, T?>>?>|> : R|kotlin/Any| {
+        public abstract fun foo(t: R|ft<T, T?>|): R|kotlin/Unit|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBoundMultipleParameters.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBoundMultipleParameters.fir.txt
index 6baed087d34..e22ffce7396 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBoundMultipleParameters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBoundMultipleParameters.fir.txt
@@ -1,4 +1,20 @@
 public open class RawSuperTypeWithRecursiveBoundMultipleParameters : R|kotlin/Any| {
     public constructor(): R|test/RawSuperTypeWithRecursiveBoundMultipleParameters|
 
+    public open inner class Derived : R|kotlin/Any|, R|test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super<ft<kotlin/Any, kotlin/Any?>, ft<test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super<*, *>, test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super<*, *>?>>| {
+        public open fun foo(o: R|ft<kotlin/Any, kotlin/Any?>|, o1: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Unit|
+
+        @R|java/lang/Override|() public open fun foo(r: R|ft<kotlin/Any, kotlin/Any?>|, t: R|ft<test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super<ft<kotlin/Any, kotlin/Any?>, ft<test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super<*, *>, test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super<*, *>?>>, test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super<*, *>?>|): R|kotlin/Unit|
+
+        @R|java/lang/Override|() public open fun dummy(): R|kotlin/Unit|
+
+        public constructor(): R|test/RawSuperTypeWithRecursiveBoundMultipleParameters.Derived|
+
+    }
+    public abstract interface Super<R : R|ft<kotlin/Any, kotlin/Any?>|, T : R|ft<test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super<ft<R, R?>, ft<T, T?>>, test/RawSuperTypeWithRecursiveBoundMultipleParameters.Super<ft<R, R?>, ft<T, T?>>?>|> : R|kotlin/Any| {
+        public abstract fun foo(r: R|ft<R, R?>|, t: R|ft<T, T?>|): R|kotlin/Unit|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.fir.txt
index c59c62d8b28..0fa7d3f9db1 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.fir.txt
@@ -1,2 +1,22 @@
 public abstract interface ReturnInnerSubclassOfSupersInner : R|kotlin/Any| {
+    public open class Sub<B : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/ReturnInnerSubclassOfSupersInner.Super<ft<B, B?>>| {
+        public constructor<B : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/ReturnInnerSubclassOfSupersInner.Sub<B>|
+
+        public/*package*/ open inner class Inner<B : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/ReturnInnerSubclassOfSupersInner.Super.Inner<ft<B, B?>>| {
+            public/*package*/ open operator fun get(): R|ft<test/ReturnInnerSubclassOfSupersInner.Sub<ft<B, B?>>, test/ReturnInnerSubclassOfSupersInner.Sub<ft<B, B?>>?>|
+
+            public/*package*/ constructor(): R|test/ReturnInnerSubclassOfSupersInner.Sub.Inner<B>|
+
+        }
+    }
+    public open class Super<A : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+        public constructor<A : R|ft<kotlin/Any, kotlin/Any?>|>(): R|test/ReturnInnerSubclassOfSupersInner.Super<A>|
+
+        public/*package*/ open inner class Inner<A : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
+            public/*package*/ open operator fun get(): R|ft<test/ReturnInnerSubclassOfSupersInner.Super<ft<A, A?>>, test/ReturnInnerSubclassOfSupersInner.Super<ft<A, A?>>?>|
+
+            public/*package*/ constructor(): R|test/ReturnInnerSubclassOfSupersInner.Super.Inner<A>|
+
+        }
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.fir.txt
index b1cffcdc329..6c6a7701fc2 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.fir.txt
@@ -1,2 +1,38 @@
 public abstract interface SubclassWithRawType : R|kotlin/Any| {
+    public abstract interface Sub : R|test/SubclassWithRawType.Super| {
+        public abstract fun simple1(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+
+        public abstract fun simple2(): R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|
+
+        public abstract fun simple3(): R|ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>|
+
+        public abstract fun boundWildcard1(): R|ft<kotlin/collections/MutableList<out ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<out ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|
+
+        public abstract fun boundWildcard2(): R|ft<kotlin/collections/MutableList<in ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>>, kotlin/collections/MutableList<in ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>>?>|
+
+        public abstract fun wildcard(): R|ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>|
+
+        public abstract fun array1(): R|ft<kotlin/Array<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/Array<out ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|
+
+        public abstract fun array2(): R|ft<kotlin/Array<ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>>, kotlin/Array<out ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>>?>|
+
+    }
+    public abstract interface Super : R|kotlin/Any| {
+        public abstract fun simple1(): R|ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>|
+
+        public abstract fun simple2(): R|ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>|
+
+        public abstract fun simple3(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+
+        public abstract fun boundWildcard1(): R|ft<kotlin/collections/MutableList<out ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>>, kotlin/collections/List<out ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>>?>|
+
+        public abstract fun boundWildcard2(): R|ft<kotlin/collections/MutableList<in ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/MutableList<in ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|
+
+        public abstract fun wildcard(): R|ft<kotlin/collections/MutableList<*>, kotlin/collections/List<*>?>|
+
+        public abstract fun array1(): R|ft<kotlin/Array<ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>>, kotlin/Array<out ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>>?>|
+
+        public abstract fun array2(): R|ft<kotlin/Array<ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>, kotlin/Array<out ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>>?>|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt
index 5833bc15edf..87e02a0965d 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.fir.txt
@@ -3,4 +3,18 @@ public abstract interface TwoSuperclassesInconsistentGenericTypes : R|kotlin/Any
 
     public abstract fun dummy(): R|kotlin/Unit|
 
+    public abstract interface Other : R|kotlin/Any| {
+        public abstract fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+
+        public abstract fun dummy(): R|kotlin/Unit|
+
+    }
+    public open class Sub : R|kotlin/Any|, R|test/TwoSuperclassesInconsistentGenericTypes|, R|test/TwoSuperclassesInconsistentGenericTypes.Other| {
+        public open fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|
+
+        public open fun dummy(): R|kotlin/Unit|
+
+        public constructor(): R|test/TwoSuperclassesInconsistentGenericTypes.Sub|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.fir.txt b/compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.fir.txt
index 95776bde8ef..0cfb129efbd 100644
--- a/compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.fir.txt
@@ -1,4 +1,22 @@
 public open class DeeplyInnerClass : R|kotlin/Any| {
     public constructor(): R|test/DeeplyInnerClass|
 
+    public/*package*/ open inner class A : R|kotlin/Any| {
+        public/*package*/ open fun a(): R|kotlin/Unit|
+
+        public/*package*/ constructor(): R|test/DeeplyInnerClass.A|
+
+        public/*package*/ open inner class B : R|kotlin/Any| {
+            public/*package*/ open fun b(): R|kotlin/Unit|
+
+            public/*package*/ constructor(): R|test/DeeplyInnerClass.A.B|
+
+            public/*package*/ open inner class C : R|kotlin/Any| {
+                public/*package*/ open fun c(): R|kotlin/Unit|
+
+                public/*package*/ constructor(): R|test/DeeplyInnerClass.A.B.C|
+
+            }
+        }
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.fir.txt b/compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.fir.txt
index 801f8143c56..dfd23a6aab8 100644
--- a/compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.fir.txt
@@ -1,4 +1,14 @@
 public open class DeeplyNestedStatic : R|kotlin/Any| {
     public constructor(): R|test/DeeplyNestedStatic|
 
+    public open class Foo : R|kotlin/Any| {
+        public constructor(): R|test/DeeplyNestedStatic.Foo|
+
+        public open class Bar : R|kotlin/Any| {
+            public open static fun method(): R|kotlin/Unit|
+
+            public constructor(): R|test/DeeplyNestedStatic.Foo.Bar|
+
+        }
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/static/Enum.fir.txt b/compiler/testData/loadJava/compiledJava/static/Enum.fir.txt
index 6d3b89ec755..a555ee14891 100644
--- a/compiler/testData/loadJava/compiledJava/static/Enum.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/static/Enum.fir.txt
@@ -8,4 +8,20 @@ public final enum class Enum : R|kotlin/Enum<ft<test/Enum, test/Enum?>>| {
     public final static fun valueOf(value: R|kotlin/String|): R|test/Enum| {
     }
 
+    public open inner class Inner : R|kotlin/Any| {
+        public/*package*/ open fun bar(): R|kotlin/Unit|
+
+        public/*package*/ open fun valueOf(s: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
+
+        public constructor(): R|test/Enum.Inner|
+
+    }
+    public open class Nested : R|kotlin/Any| {
+        public/*package*/ open fun foo(): R|kotlin/Unit|
+
+        public/*package*/ open fun values(): R|kotlin/Unit|
+
+        public constructor(): R|test/Enum.Nested|
+
+    }
 }
diff --git a/compiler/testData/loadJava/compiledJava/static/InnerClass.fir.txt b/compiler/testData/loadJava/compiledJava/static/InnerClass.fir.txt
index 20600fe93b8..019720cd6eb 100644
--- a/compiler/testData/loadJava/compiledJava/static/InnerClass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/static/InnerClass.fir.txt
@@ -1,4 +1,16 @@
 public open class InnerClass : R|kotlin/Any| {
     public constructor(): R|test/InnerClass|
 
+    public open inner class Inner : R|kotlin/Any| {
+        public open fun foo(): R|kotlin/Unit|
+
+        public constructor(): R|test/InnerClass.Inner|
+
+    }
+    public open class Nested : R|kotlin/Any| {
+        public open fun bar(): R|kotlin/Unit|
+
+        public constructor(): R|test/InnerClass.Nested|
+
+    }
 }