diff --git a/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.txt b/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.txt
index f4f7754d760..768c4d5365c 100644
--- a/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.txt
+++ b/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.txt
@@ -3,4 +3,4 @@ package test
 public final class ArrayTypeVariance {
     public constructor ArrayTypeVariance()
     public final fun toArray(/*0*/ p0: kotlin.Array<(out) kotlin.Any!>!): kotlin.Array<(out) kotlin.Any!>!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.txt b/compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.txt
index 22fb85990f9..4372e88e934 100644
--- a/compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.txt
@@ -32,4 +32,4 @@ public abstract class ClassDoesNotOverrideMethod : java.util.Date {
     kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun toGMTString(): kotlin.String!
     kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun toLocaleString(): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun writeObject(/*0*/ p0: java.io.ObjectOutputStream!): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithConstVal.txt b/compiler/testData/loadJava/compiledJava/ClassWithConstVal.txt
index 383720d408e..73976b21276 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithConstVal.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithConstVal.txt
@@ -4,4 +4,4 @@ public final class ClassWithConstVal {
     public constructor ClassWithConstVal()
     public final val f: kotlin.Int = 1
     public final val f2: kotlin.Int = 1
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypeP.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypeP.txt
index d210d16c87d..f7b8e7c126b 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypeP.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypeP.txt
@@ -2,4 +2,4 @@ package test
 
 public final class ClassWithTypeP</*0*/ P> {
     public constructor ClassWithTypeP</*0*/ P>()
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.txt
index aaf0c788b2a..60575f715b0 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.txt
@@ -3,4 +3,4 @@ package test
 public abstract class ClassWithTypePExtendsIterableP</*0*/ P> : kotlin.MutableIterable<P!> {
     public constructor ClassWithTypePExtendsIterableP</*0*/ P>()
     public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<P!>
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePP.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePP.txt
index 9921b69714e..0af43b51251 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypePP.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePP.txt
@@ -2,4 +2,4 @@ package test
 
 public final class ClassWithTypePP</*0*/ P, /*1*/ Q : P!> {
     public constructor ClassWithTypePP</*0*/ P, /*1*/ Q : P!>()
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.txt
index c9c4b67e5bb..97486e5a37a 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.txt
@@ -2,4 +2,4 @@ package test
 
 public open class ClassWithTypePRefNext</*0*/ R : kotlin.(Mutable)Iterable<P!>!, /*1*/ P> {
     public constructor ClassWithTypePRefNext</*0*/ R : kotlin.(Mutable)Iterable<P!>!, /*1*/ P>()
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.txt
index aea8b50aeaf..44d0c5db5ad 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.txt
@@ -2,4 +2,4 @@ package test
 
 public final class ClassWithTypePRefSelf</*0*/ P : kotlin.Enum<P!>!> {
     public constructor ClassWithTypePRefSelf</*0*/ P : kotlin.Enum<P!>!>()
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.txt
index 7413374c60d..593c898b4d7 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.txt
@@ -2,4 +2,4 @@ package test
 
 public final class ClassWithTypePRefSelfAndClass</*0*/ P : test.ClassWithTypePRefSelfAndClass<P!>!> {
     public constructor ClassWithTypePRefSelfAndClass</*0*/ P : test.ClassWithTypePRefSelfAndClass<P!>!>()
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/EnumMembers.txt b/compiler/testData/loadJava/compiledJava/EnumMembers.txt
index 8f8ef8d6a9d..b64d2add61c 100644
--- a/compiler/testData/loadJava/compiledJava/EnumMembers.txt
+++ b/compiler/testData/loadJava/compiledJava/EnumMembers.txt
@@ -42,4 +42,4 @@ public final enum class EnumMembers : kotlin.Enum<test.EnumMembers!> {
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumMembers
     public final /*synthesized*/ fun values(): kotlin.Array<test.EnumMembers>
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/FieldAsVar.txt b/compiler/testData/loadJava/compiledJava/FieldAsVar.txt
index 7cc3799837e..1b8c7804cb8 100644
--- a/compiler/testData/loadJava/compiledJava/FieldAsVar.txt
+++ b/compiler/testData/loadJava/compiledJava/FieldAsVar.txt
@@ -3,4 +3,4 @@ package test
 public final class FieldAsVar {
     public constructor FieldAsVar()
     public final var f: kotlin.Int
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/FieldOfArrayType.txt b/compiler/testData/loadJava/compiledJava/FieldOfArrayType.txt
index 567b838a6b3..d04dd9c6631 100644
--- a/compiler/testData/loadJava/compiledJava/FieldOfArrayType.txt
+++ b/compiler/testData/loadJava/compiledJava/FieldOfArrayType.txt
@@ -3,4 +3,4 @@ package test
 public open class FieldOfArrayType {
     public constructor FieldOfArrayType()
     public final var files: kotlin.Array<(out) java.io.File!>!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/FinalFieldAsVal.txt b/compiler/testData/loadJava/compiledJava/FinalFieldAsVal.txt
index 5e0eb8b96b6..a7d360e3709 100644
--- a/compiler/testData/loadJava/compiledJava/FinalFieldAsVal.txt
+++ b/compiler/testData/loadJava/compiledJava/FinalFieldAsVal.txt
@@ -3,4 +3,4 @@ package test
 public final class FinalFieldAsVal {
     public constructor FinalFieldAsVal()
     public final val f: kotlin.Int = 1
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypes.txt b/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypes.txt
index dcdd3a7083d..7d1d8590608 100644
--- a/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypes.txt
+++ b/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypes.txt
@@ -17,4 +17,4 @@ public final class InheritMethodsDifferentReturnTypes {
         public abstract fun bar(): kotlin.CharSequence!
         public abstract fun foo(): kotlin.String!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.txt b/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.txt
index b7fa12bb112..0f1fd4c8451 100644
--- a/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.txt
+++ b/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.txt
@@ -17,4 +17,4 @@ public final class InheritMethodsDifferentReturnTypesGeneric {
         public abstract fun bar(): BB!
         public abstract fun foo(): FF!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/InnerClass.txt b/compiler/testData/loadJava/compiledJava/InnerClass.txt
index 7ff7234c27f..5777f3ec96b 100644
--- a/compiler/testData/loadJava/compiledJava/InnerClass.txt
+++ b/compiler/testData/loadJava/compiledJava/InnerClass.txt
@@ -6,4 +6,4 @@ public open class InnerClass {
     public open inner class Inner {
         public constructor Inner()
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.txt b/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.txt
index 8449349a102..58375e00237 100644
--- a/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.txt
+++ b/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.txt
@@ -6,4 +6,4 @@ public open class InnerClassReferencesOuterTP</*0*/ P> {
     public open inner class Inner</*0*/ Q : P!> {
         public constructor Inner</*0*/ Q : P!>()
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.txt b/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.txt
index a77fb7f3dc3..6dfdc9188f5 100644
--- a/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.txt
+++ b/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.txt
@@ -11,4 +11,4 @@ public open class InnerClassesInGeneric</*0*/ P, /*1*/ Q> {
         public constructor Inner2()
         public open fun iterator(): kotlin.(Mutable)Iterator<P!>!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/InnerOfGeneric.txt b/compiler/testData/loadJava/compiledJava/InnerOfGeneric.txt
index 4e5e68a1cd1..84e10e98bc8 100644
--- a/compiler/testData/loadJava/compiledJava/InnerOfGeneric.txt
+++ b/compiler/testData/loadJava/compiledJava/InnerOfGeneric.txt
@@ -2,7 +2,7 @@ package test
 
 public open class InnerOfGeneric {
     public constructor InnerOfGeneric()
-    
+
     public abstract inner class A</*0*/ K> {
         public constructor A</*0*/ K>()
 
@@ -14,17 +14,17 @@ public open class InnerOfGeneric {
 
     public open inner class B</*0*/ L> : test.InnerOfGeneric.A<L!> {
         public constructor B</*0*/ L>()
-        
+
         public open inner class SubInner : test.InnerOfGeneric.A.Inner {
             public constructor SubInner()
             public open override /*1*/ fun iterator(): kotlin.(Mutable)Iterator<L!>!
         }
     }
-    
+
     public trait S</*0*/ E> {
         public abstract fun iterator(): kotlin.(Mutable)Iterator<E!>!
     }
-    
+
     // Static members
-    public final /*synthesized*/ fun </*0*/ E> S(/*0*/ function: () -> kotlin.MutableIterator<E!>!): test.InnerOfGeneric.S<E>
-}
+    public final /*synthesized*/ fun </*0*/ E> S(/*0*/ function: () -> kotlin.(Mutable)Iterator<E!>!): test.InnerOfGeneric.S<E>
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/JavaEnum.txt b/compiler/testData/loadJava/compiledJava/JavaEnum.txt
index 5933a52d12e..f684256ec8c 100644
--- a/compiler/testData/loadJava/compiledJava/JavaEnum.txt
+++ b/compiler/testData/loadJava/compiledJava/JavaEnum.txt
@@ -32,4 +32,4 @@ public final enum class JavaEnum : kotlin.Enum<test.JavaEnum!> {
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.JavaEnum
     public final /*synthesized*/ fun values(): kotlin.Array<test.JavaEnum>
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.txt b/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.txt
index 9da1146ef5f..28206d9ba9a 100644
--- a/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.txt
+++ b/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.txt
@@ -7,4 +7,4 @@ public final class MethodReferencesOuterClassTP</*0*/ P> {
         public constructor Inner()
         public final fun </*0*/ Q : P!> f(): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.txt b/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.txt
index 8ae76aa6322..3ff4ba889f1 100644
--- a/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.txt
+++ b/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.txt
@@ -3,4 +3,4 @@ package test
 public open class MethodTypePOneUpperBound {
     public constructor MethodTypePOneUpperBound()
     public open fun </*0*/ T : kotlin.Cloneable!> bar(): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.txt b/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.txt
index cb0b79383e7..e46fa0f2884 100644
--- a/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.txt
+++ b/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.txt
@@ -3,4 +3,4 @@ package test
 public open class MethodTypePTwoUpperBounds {
     public constructor MethodTypePTwoUpperBounds()
     public open fun </*0*/ T : kotlin.Cloneable!> foo(): kotlin.Unit where T : java.lang.Runnable!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/MethodWithTypeP.txt b/compiler/testData/loadJava/compiledJava/MethodWithTypeP.txt
index 05849efead9..c9c57192819 100644
--- a/compiler/testData/loadJava/compiledJava/MethodWithTypeP.txt
+++ b/compiler/testData/loadJava/compiledJava/MethodWithTypeP.txt
@@ -3,4 +3,4 @@ package test
 public final class MethodWithTypeP {
     public constructor MethodWithTypeP()
     public final fun </*0*/ P> f(): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/MethodWithTypePP.txt b/compiler/testData/loadJava/compiledJava/MethodWithTypePP.txt
index 3384c76e783..fce9b2ac503 100644
--- a/compiler/testData/loadJava/compiledJava/MethodWithTypePP.txt
+++ b/compiler/testData/loadJava/compiledJava/MethodWithTypePP.txt
@@ -3,4 +3,4 @@ package test
 public final class MethodWithTypePP {
     public constructor MethodWithTypePP()
     public final fun </*0*/ P, /*1*/ Q : P!> f(): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.txt b/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.txt
index 3b0e3580d34..423ba353b8a 100644
--- a/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.txt
+++ b/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.txt
@@ -3,4 +3,4 @@ package test
 public open class MethodWithTypePRefClassP</*0*/ P> {
     public constructor MethodWithTypePRefClassP</*0*/ P>()
     public final fun </*0*/ Q : P!> f(): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.txt b/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.txt
index 83de328230d..ad9a88f159e 100644
--- a/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.txt
+++ b/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.txt
@@ -3,4 +3,4 @@ package test
 public final class MethosWithPRefTP {
     public constructor MethosWithPRefTP()
     public final fun </*0*/ P> f(/*0*/ p0: P!): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/MyException.txt b/compiler/testData/loadJava/compiledJava/MyException.txt
index 67182826192..5c1d1e78918 100644
--- a/compiler/testData/loadJava/compiledJava/MyException.txt
+++ b/compiler/testData/loadJava/compiledJava/MyException.txt
@@ -2,4 +2,4 @@ package test
 
 public open class MyException {
     public constructor MyException(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.Throwable!)
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/NestedClass.txt b/compiler/testData/loadJava/compiledJava/NestedClass.txt
index 541987ba206..6c00b4dbb5a 100644
--- a/compiler/testData/loadJava/compiledJava/NestedClass.txt
+++ b/compiler/testData/loadJava/compiledJava/NestedClass.txt
@@ -6,4 +6,4 @@ public open class NestedClass {
     public open class Nested {
         public constructor Nested()
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/OverrideMethod.txt b/compiler/testData/loadJava/compiledJava/OverrideMethod.txt
index 39ada0599c6..750f162a9f1 100644
--- a/compiler/testData/loadJava/compiledJava/OverrideMethod.txt
+++ b/compiler/testData/loadJava/compiledJava/OverrideMethod.txt
@@ -22,4 +22,4 @@ public open class OverrideMethod {
         public/*package*/ constructor SuperBase()
         public/*package*/ open fun quux(/*0*/ p0: kotlin.Int): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.txt b/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.txt
index 5e15af38eef..95e2e259854 100644
--- a/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.txt
+++ b/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.txt
@@ -3,4 +3,4 @@ package test
 public open class JFrame : awt.Frame {
     public constructor JFrame()
     protected/*protected and package*/ final var accessibleContext: kotlin.String!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/PrivateMembers.txt b/compiler/testData/loadJava/compiledJava/PrivateMembers.txt
index 2b006cb7ab3..0193845795b 100644
--- a/compiler/testData/loadJava/compiledJava/PrivateMembers.txt
+++ b/compiler/testData/loadJava/compiledJava/PrivateMembers.txt
@@ -10,20 +10,20 @@ public open class PrivateMembers {
     private open inner class Inner {
         private constructor Inner()
     }
-    
+
     private open class Nested {
         private constructor Nested()
-        
+
         // Static members
         private open fun staticMethodInNested(): kotlin.Unit
     }
-    
+
     private trait SamInterface {
         public abstract fun foo(): kotlin.Unit
     }
-    
+
     // Static members
     private final var staticField: kotlin.Int
     private final /*synthesized*/ fun SamInterface(/*0*/ function: () -> kotlin.Unit): test.PrivateMembers.SamInterface
     private open fun staticMethod(): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/PrivateMembersInHierarchy.txt b/compiler/testData/loadJava/compiledJava/PrivateMembersInHierarchy.txt
index b59e47ac24d..9606cc1b81c 100644
--- a/compiler/testData/loadJava/compiledJava/PrivateMembersInHierarchy.txt
+++ b/compiler/testData/loadJava/compiledJava/PrivateMembersInHierarchy.txt
@@ -16,4 +16,4 @@ public open class PrivateMembersInHierarchy {
         private final var field2: kotlin.Int
         private open fun method(): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.txt b/compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.txt
index 4d9ac57ad7f..b9386b8848c 100644
--- a/compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.txt
+++ b/compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.txt
@@ -1,14 +1,14 @@
 package test
 
 public trait RawTypeWithUpperBound {
-    
+
     public trait Bar {
         public abstract fun f(/*0*/ p0: test.RawTypeWithUpperBound.Foo<out kotlin.CharSequence!>!): kotlin.Unit
     }
 
     public trait Foo</*0*/ T : kotlin.CharSequence!> {
     }
-    
+
     // Static members
-    public /*synthesized*/ fun Bar(/*0*/ function: (test.RawTypeWithUpperBound.Foo<out kotlin.CharSequence!>!) -> kotlin.Unit): test.RawTypeWithUpperBound.Bar
-}
+    public final /*synthesized*/ fun Bar(/*0*/ function: (test.RawTypeWithUpperBound.Foo<out kotlin.CharSequence!>!) -> kotlin.Unit): test.RawTypeWithUpperBound.Bar
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/RawUpperBound.txt b/compiler/testData/loadJava/compiledJava/RawUpperBound.txt
index 59c1036ded4..dc2520b8044 100644
--- a/compiler/testData/loadJava/compiledJava/RawUpperBound.txt
+++ b/compiler/testData/loadJava/compiledJava/RawUpperBound.txt
@@ -1,4 +1,4 @@
 package test
 
-public trait RawUpperBound</*0*/ T : test.RawUpperBound<out kotlin.Any?>?> {
-}
+public trait RawUpperBound</*0*/ T : test.RawUpperBound<out kotlin.Any?>!> {
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.txt b/compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.txt
index 684244f18b2..0095ef35a23 100644
--- a/compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.txt
+++ b/compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.txt
@@ -1,4 +1,4 @@
 package test
 
-public trait RecursiveRawUpperBound</*0*/ T : test.RecursiveRawUpperBound<out kotlin.Any?>?> {
-}
+public trait RecursiveRawUpperBound</*0*/ T : test.RecursiveRawUpperBound<out kotlin.Any?>!> {
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.txt b/compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.txt
index f5e40bcc113..ec30033f9c8 100644
--- a/compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.txt
+++ b/compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.txt
@@ -1,4 +1,4 @@
 package test
 
-public trait RecursiveWildcardUpperBound</*0*/ T : test.RecursiveWildcardUpperBound<out kotlin.Any?>?> {
-}
+public trait RecursiveWildcardUpperBound</*0*/ T : test.RecursiveWildcardUpperBound<out kotlin.Any?>!> {
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.txt b/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.txt
index dc7ef424f95..79eafc1cf66 100644
--- a/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.txt
@@ -3,4 +3,4 @@ package test
 public trait RemoveRedundantProjectionKind {
     public abstract fun f(/*0*/ p0: (kotlin.MutableCollection<out kotlin.CharSequence!>..kotlin.Collection<kotlin.CharSequence!>?)): kotlin.Unit
     public abstract fun f(/*0*/ p0: kotlin.Comparable<kotlin.CharSequence!>!): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/Simple.txt b/compiler/testData/loadJava/compiledJava/Simple.txt
index 68d64bc8da2..18b05d70c85 100644
--- a/compiler/testData/loadJava/compiledJava/Simple.txt
+++ b/compiler/testData/loadJava/compiledJava/Simple.txt
@@ -2,4 +2,4 @@ package test
 
 public final class Simple {
     public constructor Simple()
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/SubclassFromNested.txt b/compiler/testData/loadJava/compiledJava/SubclassFromNested.txt
index 43c922aaa87..31af81c7ec3 100644
--- a/compiler/testData/loadJava/compiledJava/SubclassFromNested.txt
+++ b/compiler/testData/loadJava/compiledJava/SubclassFromNested.txt
@@ -9,4 +9,4 @@ public/*package*/ open class B {
 
 public open class SubclassFromNested : test.B.C {
     public constructor SubclassFromNested()
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/TwoFields.txt b/compiler/testData/loadJava/compiledJava/TwoFields.txt
index 3219f7b614a..c578f895f53 100644
--- a/compiler/testData/loadJava/compiledJava/TwoFields.txt
+++ b/compiler/testData/loadJava/compiledJava/TwoFields.txt
@@ -4,4 +4,4 @@ public final class TwoFields {
     public constructor TwoFields()
     public final var a: kotlin.Int
     public final var b: kotlin.Short
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/UnboundWildcard.txt b/compiler/testData/loadJava/compiledJava/UnboundWildcard.txt
index 94bd6583d3d..520c5e7bc80 100644
--- a/compiler/testData/loadJava/compiledJava/UnboundWildcard.txt
+++ b/compiler/testData/loadJava/compiledJava/UnboundWildcard.txt
@@ -6,4 +6,4 @@ public final class UnboundWildcard {
 
     public trait MyClass</*0*/ T : kotlin.CharSequence!> {
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedAnnotation.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedAnnotation.txt
index f96ba4792ab..8cfb09dd637 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedAnnotation.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedAnnotation.txt
@@ -2,4 +2,4 @@ package test
 
 test.AnnotatedAnnotation() public final annotation class AnnotatedAnnotation : kotlin.Annotation {
     public constructor AnnotatedAnnotation()
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.txt
index 8590bec62e7..b816d8bfe07 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.txt
@@ -3,4 +3,4 @@ package test
 public open class AnnotatedMethod {
     public constructor AnnotatedMethod()
     kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open fun f(): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.txt
index 0253de3ed0a..9f8e85157dc 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.txt
@@ -44,4 +44,4 @@ public trait AnnotationInParam {
         public constructor MyAnnotationWithParam3(/*0*/ value: test.AnnotationInParam.MyAnnotation3)
         public abstract fun value(): test.AnnotationInParam.MyAnnotation3
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.txt
index a876eb5e40d..debdac75833 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.txt
@@ -11,4 +11,4 @@ public open class ArithmeticExpressionInParam {
     test.ArithmeticExpressionInParam.Anno(value = 42: kotlin.Int) public open class Class {
         public constructor Class()
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt
index ec04c206e72..76663857f74 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt
@@ -6,4 +6,4 @@ public trait ArrayOfEnumInParam {
         public constructor targetAnnotation(/*0*/ value: kotlin.String)
         public abstract fun value(): kotlin.String
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt
index ad7b5fdd9a2..565b1fc4cb3 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt
@@ -10,4 +10,4 @@ public trait ArrayOfStringInParam {
         public constructor MyAnnotation(/*0*/ vararg value: kotlin.String /*kotlin.Array<kotlin.String>*/)
         public abstract fun value(): kotlin.Array<kotlin.String>
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt
index 9a0413b006e..aeb3ae9c0c0 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt
@@ -11,4 +11,4 @@ public open class ClassObjectArrayInParam {
     test.ClassObjectArrayInParam.Anno(value = {test.ClassObjectArrayInParam.class, test.ClassObjectArrayInParam.Nested.class, kotlin.String.class}: kotlin.Array<java.lang.Class<out kotlin.Any?>>) public open class Nested {
         public constructor Nested()
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.txt
index 49ec309a11b..9b67eb7674b 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.txt
@@ -11,4 +11,4 @@ public open class ClassObjectInParam {
     test.ClassObjectInParam.Anno(value = test.ClassObjectInParam.class: java.lang.Class<test.ClassObjectInParam>) public open class Nested {
         public constructor Nested()
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt
index 3c05c4ee984..2ad2e8faadf 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt
@@ -32,4 +32,4 @@ public trait CustomAnnotation {
     test.CustomAnnotation.MyAnnotation(value = MyEnum.ONE: test.CustomAnnotation.MyEnum) public open class MyTest {
         public constructor MyTest()
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.txt b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.txt
index a0a612a9947..d37fff44df1 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.txt
@@ -11,4 +11,4 @@ public trait CustomAnnotationWithDefaultParameter {
     test.CustomAnnotationWithDefaultParameter.MyAnnotation(first = "f": kotlin.String, second = "s": kotlin.String) public open class MyTest {
         public constructor MyTest()
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.txt
index 8bd2efdce70..88cb53d341d 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.txt
@@ -10,4 +10,4 @@ public trait EmptyArrayInParam {
         public constructor MyAnnotation(/*0*/ vararg value: kotlin.String /*kotlin.Array<kotlin.String>*/)
         public abstract fun value(): kotlin.Array<kotlin.String>
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.txt
index ccc5c28fe0c..22454052f76 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.txt
@@ -6,4 +6,4 @@ public trait EnumInParam {
         public constructor RetentionAnnotation(/*0*/ value: kotlin.String)
         public abstract fun value(): kotlin.String
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.txt
index aff0b3debc5..b29b0ee0675 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.txt
@@ -15,4 +15,4 @@ public trait PrimitiveValueInParam {
         public abstract fun l(): kotlin.Long
         public abstract fun str(): kotlin.String
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.txt b/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.txt
index 04229db6562..eb09bb5b062 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.txt
@@ -11,4 +11,4 @@ public trait RecursiveAnnotation {
         public constructor B(/*0*/ value: test.RecursiveAnnotation.A)
         public abstract fun value(): test.RecursiveAnnotation.A
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.txt b/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.txt
index 7c48173b7b3..9842e170602 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.txt
@@ -11,4 +11,4 @@ public trait RecursiveAnnotation2 {
         public constructor B(/*0*/ value: kotlin.String)
         public abstract fun value(): kotlin.String
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/annotations/SimpleAnnotation.txt b/compiler/testData/loadJava/compiledJava/annotations/SimpleAnnotation.txt
index b53630f497e..f3e54e6a046 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/SimpleAnnotation.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/SimpleAnnotation.txt
@@ -2,4 +2,4 @@ package test
 
 public final annotation class SimpleAnnotation : kotlin.Annotation {
     public constructor SimpleAnnotation()
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.txt
index fd7790b8f7f..373646ebdf3 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.txt
@@ -10,4 +10,4 @@ public trait StringConcatenationInParam {
     test.StringConcatenationInParam.Anno(value = "hello": kotlin.String) public open class Class {
         public constructor Class()
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.txt
index c2c0889d4cf..0618775f556 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.txt
@@ -1,16 +1,16 @@
 package test
 
 public trait StringConstantInParam {
-    
+
     public final annotation class Anno : kotlin.Annotation {
         public constructor Anno(/*0*/ value: kotlin.String)
         public abstract fun value(): kotlin.String
     }
-    
+
     test.StringConstantInParam.Anno(value = "hello": kotlin.String) public open class Class {
         public constructor Class()
     }
-    
+
     // Static members
     public final val HEL: kotlin.String = "hel"
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/annotations/StringInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/StringInParam.txt
index 84c91d6efbe..8270c696ecd 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/StringInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/StringInParam.txt
@@ -10,4 +10,4 @@ public trait StringInParam {
     test.StringInParam.Anno(value = "hello": kotlin.String) public open class Class {
         public constructor Class()
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.txt b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.txt
index f5b0442f9dd..6e1e52cc8ed 100644
--- a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.txt
+++ b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.txt
@@ -2,4 +2,4 @@ package test
 
 public open class ConstructorGenericDeep {
     public constructor ConstructorGenericDeep(/*0*/ p0: java.lang.Class<kotlin.Any!>!)
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.txt b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.txt
index 11b091671b0..5ed0daacf24 100644
--- a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.txt
+++ b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.txt
@@ -2,4 +2,4 @@ package test
 
 public open class ConstructorGenericSimple {
     public constructor ConstructorGenericSimple(/*0*/ p0: kotlin.Any!)
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.txt b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.txt
index 23ed8d349ce..4381fed40ac 100644
--- a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.txt
+++ b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.txt
@@ -2,4 +2,4 @@ package test
 
 public open class ConstructorGenericUpperBound {
     public constructor ConstructorGenericUpperBound(/*0*/ p0: java.util.RandomAccess!)
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.txt b/compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.txt
index c955510bae8..b7efe50e41d 100644
--- a/compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.txt
+++ b/compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.txt
@@ -4,4 +4,4 @@ public open class DifferentGetterAndSetter {
     public constructor DifferentGetterAndSetter()
     public open fun getSomething(): kotlin.Int
     public open fun setSomething(/*0*/ p0: kotlin.String!): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanAbstractGetter.txt b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanAbstractGetter.txt
index 597adaea6c9..c8317d9ae2d 100644
--- a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanAbstractGetter.txt
+++ b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanAbstractGetter.txt
@@ -3,4 +3,4 @@ package test
 public trait JavaBeanAbstractGetter {
     public abstract fun getBlue(): kotlin.Int
     public abstract fun getRed(): kotlin.Int
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.txt b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.txt
index ab21612209b..938cb6eb968 100644
--- a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.txt
+++ b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.txt
@@ -3,4 +3,4 @@ package test
 public open class JavaBeanVal {
     public constructor JavaBeanVal()
     public open fun getColor(): kotlin.String!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.txt b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.txt
index 10f4ef5f5d5..be156694f0c 100644
--- a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.txt
+++ b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.txt
@@ -4,4 +4,4 @@ public open class JavaBeanVar {
     public constructor JavaBeanVar()
     public open fun getColor(): kotlin.String!
     public open fun setColor(/*0*/ p0: kotlin.String!): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.txt b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.txt
index 72cbd7fe749..bc907714b82 100644
--- a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.txt
+++ b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.txt
@@ -4,4 +4,4 @@ public open class JavaBeanVarOfGenericType</*0*/ P> {
     public constructor JavaBeanVarOfGenericType</*0*/ P>()
     public open fun getCharacters(): java.util.ArrayList<P!>!
     public open fun setCharacters(/*0*/ p0: java.util.ArrayList<P!>!): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.txt b/compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.txt
index c71955f412f..aca51e46fc9 100644
--- a/compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.txt
+++ b/compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.txt
@@ -4,4 +4,4 @@ public open class TwoSetters {
     public constructor TwoSetters()
     public open fun setSize(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open fun setSize(/*0*/ p0: kotlin.String!): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.txt
index 636978b88de..cb55220d1b0 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.txt
@@ -3,4 +3,4 @@ package test
 public open class AllBoundsInWhen {
     public constructor AllBoundsInWhen()
     public open fun </*0*/ T : java.io.Serializable!> foo(): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.txt
index b491c661211..304936017c9 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.txt
@@ -3,4 +3,4 @@ package test
 public open class ArrayType {
     public constructor ArrayType()
     public open fun foo(): kotlin.Array<(out) kotlin.String!>!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.txt
index bbb416ee3f7..5acbcd2ed3a 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.txt
@@ -1,5 +1,5 @@
 package test
 
 public open class ConstructorWithNewTypeParams</*0*/ T> {
-    public constructor ConstructorWithNewTypeParams</*0*/ T>(/*0*/ first: kotlin.Any)
-}
+    public constructor ConstructorWithNewTypeParams</*0*/ T>(/*0*/ first: kotlin.Any!)
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.txt
index 6482ade12d5..634d5700de7 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.txt
@@ -1,5 +1,5 @@
 package test
 
 public open class ConstructorWithParentTypeParams</*0*/ T> {
-    public constructor ConstructorWithParentTypeParams</*0*/ T>(/*0*/ first: T)
-}
+    public constructor ConstructorWithParentTypeParams</*0*/ T>(/*0*/ first: T!)
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.txt
index 487ad343567..85bd5504f3c 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.txt
@@ -1,5 +1,5 @@
 package test
 
 public open class ConstructorWithSeveralParams {
-    public constructor ConstructorWithSeveralParams(/*0*/ integer: kotlin.Int, /*1*/ intField: kotlin.Int, /*2*/ collection: java.util.ArrayList<kotlin.String>)
-}
+    public constructor ConstructorWithSeveralParams(/*0*/ integer: kotlin.Int!, /*1*/ intField: kotlin.Int, /*2*/ collection: java.util.ArrayList<kotlin.String!>!)
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithoutParams.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithoutParams.txt
index 362255d8ac3..9256c8b6b0a 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithoutParams.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithoutParams.txt
@@ -2,4 +2,4 @@ package test
 
 public open class ConstructorWithoutParams {
     public constructor ConstructorWithoutParams()
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.txt
index a95a2a7b497..d886af757ad 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.txt
@@ -2,5 +2,5 @@ package test
 
 public open class CustomProjectionKind {
     public constructor CustomProjectionKind()
-    public open fun foo(): kotlin.MutableList<out kotlin.Number>
-}
+    public open fun foo(): kotlin.(Mutable)List<kotlin.Number!>!
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.txt
index 93969487f08..93c0ff2c802 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.txt
@@ -2,5 +2,5 @@ package test
 
 public open class MethodWithFunctionTypes {
     public constructor MethodWithFunctionTypes()
-    public open fun foo(/*0*/ f: (kotlin.String?) -> kotlin.String): (kotlin.String.() -> kotlin.String?)?
-}
+    public open fun foo(/*0*/ f: ((kotlin.String!) -> kotlin.String!)!): (kotlin.String!.() -> kotlin.String!)!
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.txt
index 29558a7afd2..a255656acb7 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.txt
@@ -2,5 +2,5 @@ package test
 
 public open class MethodWithGenerics {
     public constructor MethodWithGenerics()
-    public open fun foo(/*0*/ a: kotlin.String, /*1*/ b: kotlin.List<kotlin.Map.Entry<kotlin.String?, kotlin.String>?>): kotlin.String
-}
+    public open fun foo(/*0*/ a: kotlin.String!, /*1*/ b: kotlin.(Mutable)List<kotlin.(Mutable)Map.(Mutable)Entry<kotlin.String!, kotlin.String!>!>!): kotlin.String!
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.txt
index 930ccd62f22..87bdf42457b 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.txt
@@ -2,5 +2,5 @@ package test
 
 public open class MethodWithMappedClasses {
     public constructor MethodWithMappedClasses()
-    public open fun </*0*/ T> copy(/*0*/ dest: kotlin.MutableList<in T>, /*1*/ src: kotlin.List<T>): kotlin.Unit
-}
+    public open fun </*0*/ T> copy(/*0*/ dest: kotlin.(Mutable)List<in T!>!, /*1*/ src: kotlin.(Mutable)List<T!>!): kotlin.Unit
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.txt
index b82685a7bc8..94e402ccc62 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.txt
@@ -2,5 +2,5 @@ package test
 
 public open class MethodWithTypeParameters {
     public constructor MethodWithTypeParameters()
-    public open fun </*0*/ A, /*1*/ B : java.lang.Runnable> foo(/*0*/ a: A, /*1*/ b: kotlin.List<B>, /*2*/ c: kotlin.MutableList<in kotlin.String?>): kotlin.Unit where B : kotlin.List<kotlin.Cloneable>
-}
+    public open fun </*0*/ A, /*1*/ B : java.lang.Runnable!> foo(/*0*/ a: A!, /*1*/ b: (kotlin.MutableList<out B!>..kotlin.List<B!>?), /*2*/ c: kotlin.(Mutable)List<in kotlin.String!>!): kotlin.Unit where B : kotlin.(Mutable)List<kotlin.Cloneable!>!
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.txt
index eccb281f565..6ff7fa02627 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.txt
@@ -2,5 +2,5 @@ package test
 
 public open class MethodWithVararg {
     public constructor MethodWithVararg()
-    public open fun foo(/*0*/ vararg s: kotlin.String /*kotlin.Array<kotlin.String>*/): kotlin.Unit
-}
+    public open fun foo(/*0*/ vararg s: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.txt
index 497fb3a6c22..c77139f1b32 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.txt
@@ -2,7 +2,7 @@ package test
 
 public open class PropertyArrayTypes</*0*/ T> {
     public constructor PropertyArrayTypes</*0*/ T>()
-    public final var array: kotlin.Array<kotlin.String>
-    public final var arrayOfArrays: kotlin.Array<kotlin.Array<kotlin.String>>
-    public final var genericArray: kotlin.Array<T>
-}
+    public final var array: kotlin.Array<(out) kotlin.String!>!
+    public final var arrayOfArrays: kotlin.Array<(out) kotlin.Array<(out) kotlin.String!>!>!
+    public final var genericArray: kotlin.Array<(out) T!>!
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.txt
index 4f36a168d29..bdfae93d9f4 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.txt
@@ -2,8 +2,8 @@ package test
 
 public open class PropertyComplexTypes</*0*/ T> {
     public constructor PropertyComplexTypes</*0*/ T>()
-    public final var genericType: T
-    public final var listDefinedGeneric: java.util.ArrayList<kotlin.String>
-    public final var listGeneric: java.util.ArrayList<T>
-    public final var listOfGenericList: java.util.ArrayList<java.util.ArrayList<T>>
-}
+    public final var genericType: T!
+    public final var listDefinedGeneric: java.util.ArrayList<kotlin.String!>!
+    public final var listGeneric: java.util.ArrayList<T!>!
+    public final var listOfGenericList: java.util.ArrayList<java.util.ArrayList<T!>!>!
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.txt
index 4c75cfc9626..4abe943daa6 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.txt
@@ -4,4 +4,4 @@ public open class PropertySimpleType {
     public constructor PropertySimpleType()
     public final var fieldOne: kotlin.String!
     public final var fieldTwo: kotlin.String!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.txt
index b42a62f2000..c91670193a4 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.txt
@@ -2,8 +2,8 @@ package test
 
 public final class StarProjection {
     public constructor StarProjection()
-    public final fun foo(): test.StarProjection.MyClass<out kotlin.CharSequence!>
+    public final fun foo(): test.StarProjection.MyClass<out kotlin.CharSequence!>!
 
     public trait MyClass</*0*/ T : kotlin.CharSequence!> {
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/AddingNullability.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/AddingNullability.txt
index d673339d6c7..ef27f508673 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/AddingNullability.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/AddingNullability.txt
@@ -3,4 +3,4 @@ package test
 public open class AddingNullability {
     public constructor AddingNullability()
     public open fun foo(): kotlin.Int
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ConflictingProjectionKind.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ConflictingProjectionKind.txt
index 04991e9d630..21373c17c70 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ConflictingProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ConflictingProjectionKind.txt
@@ -3,4 +3,4 @@ package test
 public open class ConflictingProjectionKind {
     public constructor ConflictingProjectionKind()
     public open fun foo(/*0*/ p0: kotlin.(Mutable)List<kotlin.Number!>!): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt
index 307507b91ad..364347f92b4 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt
@@ -3,4 +3,4 @@ package test
 public open class ExplicitFieldGettersAndSetters {
     public constructor ExplicitFieldGettersAndSetters()
     public final var foo: kotlin.String!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExtraUpperBound.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExtraUpperBound.txt
index 1738562a3b1..644a4060549 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExtraUpperBound.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExtraUpperBound.txt
@@ -3,4 +3,4 @@ package test
 public open class ExtraUpperBound {
     public constructor ExtraUpperBound()
     public open fun </*0*/ A : java.lang.Runnable!> foo(): kotlin.String!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/MissingUpperBound.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/MissingUpperBound.txt
index d457bbae3ae..b9d5ab2c332 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/MissingUpperBound.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/MissingUpperBound.txt
@@ -3,4 +3,4 @@ package test
 public open class MissingUpperBound {
     public constructor MissingUpperBound()
     public open fun </*0*/ A : java.lang.Runnable!> foo(): kotlin.String! where A : kotlin.Cloneable!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/NoFieldTypeRef.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/NoFieldTypeRef.txt
index e508522b29b..f4989b12928 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/NoFieldTypeRef.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/NoFieldTypeRef.txt
@@ -3,4 +3,4 @@ package test
 public open class NoFieldTypeRef {
     public constructor NoFieldTypeRef()
     public final var foo: kotlin.String!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/NotVarargReplacedWithVararg.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/NotVarargReplacedWithVararg.txt
index 484bf2caf43..d5c310d716f 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/NotVarargReplacedWithVararg.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/NotVarargReplacedWithVararg.txt
@@ -3,4 +3,4 @@ package test
 public open class NotVarargReplacedWithVararg {
     public constructor NotVarargReplacedWithVararg()
     public open fun foo(/*0*/ p0: kotlin.String!): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/RedundantProjectionKind.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/RedundantProjectionKind.txt
index f40a661d262..9eee69ab163 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/RedundantProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/RedundantProjectionKind.txt
@@ -2,5 +2,5 @@ package test
 
 public open class RedundantProjectionKind {
     public constructor RedundantProjectionKind()
-    public open fun foo(/*0*/ list: kotlin.List<kotlin.Number>): kotlin.Unit
-}
+    public open fun foo(/*0*/ list: kotlin.(Mutable)List<kotlin.Number!>!): kotlin.Unit
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ReturnTypeMissing.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ReturnTypeMissing.txt
index 53e99875ff9..1e7dfe8a02f 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ReturnTypeMissing.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ReturnTypeMissing.txt
@@ -3,4 +3,4 @@ package test
 public open class ReturnTypeMissing {
     public constructor ReturnTypeMissing()
     public open fun foo(/*0*/ p0: kotlin.String!): kotlin.Int
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxError.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxError.txt
index 19684a70ead..ce4afc9b3ea 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxError.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxError.txt
@@ -3,4 +3,4 @@ package test
 public open class SyntaxError {
     public constructor SyntaxError()
     public open fun foo(): kotlin.Int!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt
index 525bb51a098..4812580b3ca 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt
@@ -3,4 +3,4 @@ package test
 public open class SyntaxErrorInFieldAnnotation {
     public constructor SyntaxErrorInFieldAnnotation()
     public final var foo: kotlin.String!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt
index eed5132ac74..3994f193b8e 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt
@@ -3,4 +3,4 @@ package test
 public open class VarargReplacedWithNotVararg {
     public constructor VarargReplacedWithNotVararg()
     public open fun foo(/*0*/ vararg p0: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldInitializer.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldInitializer.txt
index 0b651101037..1e21e82fdd2 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldInitializer.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldInitializer.txt
@@ -3,4 +3,4 @@ package test
 public open class WrongFieldInitializer {
     public constructor WrongFieldInitializer()
     public final var foo: kotlin.String!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldMutability.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldMutability.txt
index e724a36fbf2..8b849cf8213 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldMutability.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldMutability.txt
@@ -4,4 +4,4 @@ public open class WrongFieldMutability {
     public constructor WrongFieldMutability()
     public final val fooFinal: kotlin.String! = "Test"
     public final var fooNotFinal: kotlin.String!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldName.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldName.txt
index 7e090f0f95b..91140d18476 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldName.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldName.txt
@@ -3,4 +3,4 @@ package test
 public open class WrongFieldName {
     public constructor WrongFieldName()
     public final var foo: kotlin.String!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongMethodName.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongMethodName.txt
index 937fed5961c..d249bc68d89 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongMethodName.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongMethodName.txt
@@ -3,4 +3,4 @@ package test
 public open class WrongMethodName {
     public constructor WrongMethodName()
     public open fun foo(): kotlin.String!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.txt
index 518ef98f8d3..336a6839507 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.txt
@@ -2,5 +2,5 @@ package test
 
 public open class WrongProjectionKind {
     public constructor WrongProjectionKind()
-    public open fun copy(/*0*/ p0: kotlin.Array<out kotlin.Number>?, /*1*/ p1: kotlin.Array<out kotlin.Number>?): kotlin.MutableList<kotlin.Number>?
-}
+    public open fun copy(/*0*/ a: kotlin.Array<(out) kotlin.Number!>!, /*1*/ b: kotlin.Array<(out) kotlin.Number!>!): kotlin.(Mutable)List<kotlin.Number!>!
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.txt
index 4424bc5f450..1965419ecfe 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.txt
@@ -3,4 +3,4 @@ package test
 public open class WrongReturnTypeStructure {
     public constructor WrongReturnTypeStructure()
     public open fun foo(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.(Mutable)List<kotlin.(Mutable)Map.(Mutable)Entry<kotlin.String!, kotlin.String!>!>!): kotlin.String!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName1.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName1.txt
index a6cda062bd5..bad3b729d08 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName1.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName1.txt
@@ -3,4 +3,4 @@ package test
 public open class WrongTypeName1 {
     public constructor WrongTypeName1()
     public open fun foo(/*0*/ p0: kotlin.String!): kotlin.String!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName2.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName2.txt
index ae585048749..f0f4f102cea 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName2.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName2.txt
@@ -3,4 +3,4 @@ package test
 public open class WrongTypeName2 {
     public constructor WrongTypeName2()
     public open fun foo(/*0*/ p0: kotlin.String!): kotlin.String!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName3.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName3.txt
index 0df001562cd..bb1a5e7318a 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName3.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName3.txt
@@ -3,4 +3,4 @@ package test
 public open class WrongTypeName3 {
     public constructor WrongTypeName3()
     public open fun foo(/*0*/ p0: kotlin.String!): kotlin.String!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
index 15f49576d89..0ab3a184095 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
@@ -3,4 +3,4 @@ package test
 public open class WrongTypeParameterBoundStructure1 {
     public constructor WrongTypeParameterBoundStructure1()
     public open fun </*0*/ A, /*1*/ B : java.lang.Runnable!> foo(/*0*/ p0: A!, /*1*/ p1: (kotlin.MutableList<out B!>..kotlin.List<B!>?)): kotlin.Unit where B : kotlin.(Mutable)List<kotlin.Cloneable!>!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
index 094ec4615af..67e328e5fb3 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
@@ -3,4 +3,4 @@ package test
 public open class WrongTypeParameterBoundStructure2 {
     public constructor WrongTypeParameterBoundStructure2()
     public open fun </*0*/ A, /*1*/ B : java.lang.Runnable!> foo(/*0*/ p0: A!, /*1*/ p1: (kotlin.MutableList<out B!>..kotlin.List<B!>?)): kotlin.Unit where B : kotlin.(Mutable)List<kotlin.Cloneable!>!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParametersCount.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParametersCount.txt
index 6bbe503b2bf..f335f881b05 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParametersCount.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParametersCount.txt
@@ -3,4 +3,4 @@ package test
 public open class WrongTypeParametersCount {
     public constructor WrongTypeParametersCount()
     public open fun </*0*/ A, /*1*/ B> foo(/*0*/ p0: A!, /*1*/ p1: (kotlin.MutableList<out B!>..kotlin.List<B!>?)): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.txt
index 86c09012e96..c3d3a66045a 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.txt
@@ -3,4 +3,4 @@ package test
 public open class WrongValueParameterStructure1 {
     public constructor WrongValueParameterStructure1()
     public open fun foo(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.(Mutable)List<kotlin.(Mutable)Map.(Mutable)Entry<kotlin.String!, kotlin.String!>!>!): kotlin.String!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.txt
index 5fc7f7df07a..47bd06fc51c 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.txt
@@ -3,4 +3,4 @@ package test
 public open class WrongValueParameterStructure2 {
     public constructor WrongValueParameterStructure2()
     public open fun foo(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.(Mutable)List<kotlin.(Mutable)Map.(Mutable)Entry<kotlin.String!, kotlin.String!>!>!): kotlin.String!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParametersCount.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParametersCount.txt
index b4cde051a9c..a73bb726653 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParametersCount.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParametersCount.txt
@@ -3,4 +3,4 @@ package test
 public open class WrongValueParametersCount {
     public constructor WrongValueParametersCount()
     public open fun foo(): kotlin.Int!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt
index 38497dd0d31..0b0ad825144 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt
@@ -3,20 +3,20 @@ package test
 public trait PropagateTypeArgumentNullable {
 
     public trait Sub : test.PropagateTypeArgumentNullable.Super {
-        public abstract override /*1*/ fun invOutR(): kotlin.MutableList<kotlin.List<kotlin.String?>>
-        public abstract override /*1*/ fun invOutS(/*0*/ p: kotlin.MutableList<kotlin.List<kotlin.String?>>): kotlin.Unit
-        public abstract override /*1*/ fun invR(): kotlin.MutableList<kotlin.String?>
-        public abstract override /*1*/ fun outOutS(/*0*/ p: kotlin.List<kotlin.List<kotlin.String?>>): kotlin.Unit
-        public abstract override /*1*/ fun outR(): kotlin.List<kotlin.String?>
-        public abstract override /*1*/ fun outS(/*0*/ p: kotlin.List<kotlin.String?>): kotlin.Unit
+        public abstract override /*1*/ fun invOutR(): kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!
+        public abstract override /*1*/ fun invOutS(/*0*/ p: kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!): kotlin.Unit
+        public abstract override /*1*/ fun invR(): kotlin.(Mutable)List<kotlin.String!>!
+        public abstract override /*1*/ fun outOutS(/*0*/ p: kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!): kotlin.Unit
+        public abstract override /*1*/ fun outR(): kotlin.(Mutable)List<kotlin.String!>!
+        public abstract override /*1*/ fun outS(/*0*/ p: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
 
     public trait Super {
-        public abstract fun invOutR(): kotlin.MutableList<kotlin.List<kotlin.String?>>
-        public abstract fun invOutS(/*0*/ p: kotlin.MutableList<kotlin.List<kotlin.String?>>): kotlin.Unit
-        public abstract fun invR(): kotlin.MutableList<kotlin.String?>
-        public abstract fun outOutS(/*0*/ p: kotlin.List<kotlin.List<kotlin.String?>>): kotlin.Unit
-        public abstract fun outR(): kotlin.List<kotlin.String?>
-        public abstract fun outS(/*0*/ p: kotlin.List<kotlin.String?>): kotlin.Unit
+        public abstract fun invOutR(): kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!
+        public abstract fun invOutS(/*0*/ p: kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!): kotlin.Unit
+        public abstract fun invR(): kotlin.(Mutable)List<kotlin.String!>!
+        public abstract fun outOutS(/*0*/ p: kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!): kotlin.Unit
+        public abstract fun outR(): kotlin.(Mutable)List<kotlin.String!>!
+        public abstract fun outS(/*0*/ p: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt
index 496bc68f718..c195975989b 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt
@@ -4,11 +4,11 @@ public trait ChangeProjectionKind1 {
 
     public trait Sub : test.ChangeProjectionKind1.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<in kotlin.String>): kotlin.Unit
+        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ p: kotlin.MutableList<in kotlin.String>): kotlin.Unit
+        public abstract fun foo(/*0*/ p: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt
index 66edcbd7178..5be6d2946ad 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt
@@ -4,11 +4,11 @@ public trait ChangeProjectionKind2 {
 
     public trait Sub : test.ChangeProjectionKind2.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
+        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
+        public abstract fun foo(/*0*/ p: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.txt
index d85715b6570..04b4937e458 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.txt
@@ -2,18 +2,18 @@ package test
 
 public trait DeeplySubstitutedClassParameter {
 
-    public trait Middle</*0*/ E> : test.DeeplySubstitutedClassParameter.Super<E> {
+    public trait Middle</*0*/ E> : test.DeeplySubstitutedClassParameter.Super<E!> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ t: E): kotlin.Unit
+        public abstract override /*1*/ fun foo(/*0*/ t: E!): kotlin.Unit
     }
 
-    public trait Sub : test.DeeplySubstitutedClassParameter.Middle<kotlin.String> {
+    public trait Sub : test.DeeplySubstitutedClassParameter.Middle<kotlin.String!> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit
+        public abstract override /*1*/ fun foo(/*0*/ t: kotlin.String!): kotlin.Unit
     }
 
     public trait Super</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ t: T): kotlin.Unit
+        public abstract fun foo(/*0*/ t: T!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.txt
index 23450f1a63e..da50df0c7f5 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.txt
@@ -2,18 +2,18 @@ package test
 
 public trait DeeplySubstitutedClassParameter2 {
 
-    public trait Middle</*0*/ E> : test.DeeplySubstitutedClassParameter2.Super<E> {
+    public trait Middle</*0*/ E> : test.DeeplySubstitutedClassParameter2.Super<E!> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ t: E): kotlin.Unit
+        public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ t: E!): kotlin.Unit
     }
 
-    public trait Sub : test.DeeplySubstitutedClassParameter2.Middle<kotlin.String> {
+    public trait Sub : test.DeeplySubstitutedClassParameter2.Middle<kotlin.String!> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit
+        public abstract override /*1*/ fun foo(/*0*/ t: kotlin.String!): kotlin.Unit
     }
 
     public trait Super</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ t: T): kotlin.Unit
+        public abstract fun foo(/*0*/ t: T!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritMutability.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritMutability.txt
index b687ddd0921..bea3445b08a 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritMutability.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritMutability.txt
@@ -4,11 +4,11 @@ public trait InheritMutability {
 
     public trait Sub : test.InheritMutability.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
+        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
+        public abstract fun foo(/*0*/ p: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVararg.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVararg.txt
index 7026686254d..85f2e5704bb 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVararg.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVararg.txt
@@ -4,11 +4,11 @@ public trait InheritNotVararg {
 
     public trait Sub : test.InheritNotVararg.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.Array<out kotlin.String>?): kotlin.Unit
+        public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.Array<out kotlin.String!>?): kotlin.Unit
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ p0: kotlin.Array<out kotlin.String>?): kotlin.Unit
+        public abstract fun foo(/*0*/ p0: kotlin.Array<(out) kotlin.String!>!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt
index 1d4fd8a1f40..bdf03576d16 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt
@@ -4,11 +4,11 @@ public trait InheritNotVarargInteger {
 
     public trait Sub : test.InheritNotVarargInteger.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.Array<out kotlin.Int>?): kotlin.Unit
+        public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.Array<out kotlin.Int!>?): kotlin.Unit
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ p0: kotlin.Array<out kotlin.Int>?): kotlin.Unit
+        public abstract fun foo(/*0*/ p0: kotlin.Array<(out) kotlin.Int!>!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt
index 2a2f2c66d7a..1ffc56da448 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt
@@ -4,11 +4,11 @@ public trait InheritNotVarargNotNull {
 
     public trait Sub : test.InheritNotVarargNotNull.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.Array<out kotlin.String>): kotlin.Unit
+        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.Array<out kotlin.String!>?): kotlin.Unit
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ p: kotlin.Array<out kotlin.String>): kotlin.Unit
+        public abstract fun foo(/*0*/ p: kotlin.Array<(out) kotlin.String!>!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt
index d8a94ad8413..58fea9544c4 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt
@@ -9,6 +9,6 @@ public trait InheritNotVarargPrimitive {
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ p0: kotlin.IntArray?): kotlin.Unit
+        public abstract fun foo(/*0*/ p0: kotlin.IntArray!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNullability.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNullability.txt
index adeae6a0fa2..cb7313889bb 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNullability.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNullability.txt
@@ -4,11 +4,11 @@ public trait InheritNullability {
 
     public trait Sub : test.InheritNullability.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String): kotlin.Unit
+        public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String!): kotlin.Unit
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ p0: kotlin.String): kotlin.Unit
+        public abstract fun foo(/*0*/ p0: kotlin.String!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritProjectionKind.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritProjectionKind.txt
index bb45f37132a..9f5ec818547 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritProjectionKind.txt
@@ -4,11 +4,11 @@ public trait InheritProjectionKind {
 
     public trait Sub : test.InheritProjectionKind.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<in kotlin.String>): kotlin.Unit
+        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ p: kotlin.MutableList<in kotlin.String>): kotlin.Unit
+        public abstract fun foo(/*0*/ p: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritReadOnliness.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritReadOnliness.txt
index 83491ecb0a0..998ca7b7961 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritReadOnliness.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritReadOnliness.txt
@@ -4,11 +4,11 @@ public trait InheritReadOnliness {
 
     public trait Sub : test.InheritReadOnliness.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.List<kotlin.String>): kotlin.Unit
+        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ p: kotlin.List<kotlin.String>): kotlin.Unit
+        public abstract fun foo(/*0*/ p: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVararg.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVararg.txt
index cd042b28f87..e8caa77c478 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVararg.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVararg.txt
@@ -4,11 +4,11 @@ public trait InheritVararg {
 
     public trait Sub : test.InheritVararg.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.String? /*kotlin.Array<kotlin.String?>*/): kotlin.Unit
+        public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.String! /*kotlin.Array<kotlin.String!>*/): kotlin.Unit
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ vararg p0: kotlin.String? /*kotlin.Array<kotlin.String?>*/): kotlin.Unit
+        public abstract fun foo(/*0*/ vararg p0: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargInteger.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargInteger.txt
index edfdd9be785..a960c631a37 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargInteger.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargInteger.txt
@@ -4,11 +4,11 @@ public trait InheritVarargInteger {
 
     public trait Sub : test.InheritVarargInteger.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.Int? /*kotlin.Array<kotlin.Int?>*/): kotlin.Unit
+        public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.Int! /*kotlin.Array<kotlin.Int!>*/): kotlin.Unit
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ vararg p0: kotlin.Int? /*kotlin.Array<kotlin.Int?>*/): kotlin.Unit
+        public abstract fun foo(/*0*/ vararg p0: kotlin.Int! /*kotlin.Array<(out) kotlin.Int!>!*/): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt
index 3aaae6178ac..ccdae973db3 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt
@@ -4,11 +4,11 @@ public trait InheritVarargNotNull {
 
     public trait Sub : test.InheritVarargNotNull.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ vararg p: kotlin.String /*kotlin.Array<kotlin.String>*/): kotlin.Unit
+        public abstract override /*1*/ fun foo(/*0*/ vararg p: kotlin.String! /*kotlin.Array<kotlin.String!>*/): kotlin.Unit
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ vararg p: kotlin.String /*kotlin.Array<kotlin.String>*/): kotlin.Unit
+        public abstract fun foo(/*0*/ vararg p: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.txt
index fb59836fb67..045e0646f29 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.txt
@@ -9,6 +9,6 @@ public trait InheritVarargPrimitive {
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ vararg p0: kotlin.Int /*kotlin.IntArray*/): kotlin.Unit
+        public abstract fun foo(/*0*/ vararg p0: kotlin.Int /*kotlin.IntArray!*/): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.txt
index 80d02cceaf8..f5a575f50cc 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.txt
@@ -4,16 +4,16 @@ public trait Kt3302 {
 
     public trait BSONObject {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun put(/*0*/ p0: kotlin.String, /*1*/ p1: kotlin.Any): kotlin.Any?
+        public abstract fun put(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.Any!): kotlin.Any!
     }
 
-    public trait BasicBSONObject : test.Kt3302.LinkedHashMap<kotlin.String, kotlin.Any>, test.Kt3302.BSONObject {
+    public trait BasicBSONObject : test.Kt3302.LinkedHashMap<kotlin.String!, kotlin.Any!>, test.Kt3302.BSONObject {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*2*/ fun put(/*0*/ key: kotlin.String, /*1*/ value: kotlin.Any): kotlin.Any?
+        public abstract override /*2*/ fun put(/*0*/ key: kotlin.String!, /*1*/ value: kotlin.Any!): kotlin.Any!
     }
 
     public trait LinkedHashMap</*0*/ K, /*1*/ V> {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun put(/*0*/ key: K, /*1*/ value: V): V?
+        public abstract fun put(/*0*/ key: K!, /*1*/ value: V!): V!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.txt
index 20d378dd58c..03b96ae5036 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.txt
@@ -4,11 +4,11 @@ public trait MutableToReadOnly {
 
     public trait Sub : test.MutableToReadOnly.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
+        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
+        public abstract fun foo(/*0*/ p: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.txt
index 46e25d17b32..6ceeedeaca1 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.txt
@@ -4,11 +4,11 @@ public trait NotNullToNullable {
 
     public trait Sub : test.NotNullToNullable.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String!): kotlin.Unit
+        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.String!): kotlin.Unit
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p0: kotlin.String!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.txt
index 488f5a73737..49cbcd212a0 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.txt
@@ -11,4 +11,4 @@ public trait NullableToNotNull {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p0: kotlin.String!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt
index 7a1e5819cfa..814c74ed755 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt
@@ -4,11 +4,11 @@ public trait NullableToNotNullKotlinSignature {
 
     public trait Sub : test.NullableToNotNullKotlinSignature.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.String?): kotlin.Unit
+        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.String!): kotlin.Unit
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ p: kotlin.String?): kotlin.Unit
+        public abstract fun foo(/*0*/ p: kotlin.String!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.txt
index 508434d2ca0..e247a33603f 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.txt
@@ -2,13 +2,14 @@ package test
 
 public trait OverrideWithErasedParameter {
 
-    public trait Sub</*0*/ T> : test.OverrideWithErasedParameter.Super<T> {
+    public trait Sub</*0*/ T> : test.OverrideWithErasedParameter.Super<T!> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ p0: T?): kotlin.Unit
+        public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: T!): kotlin.Unit
+        public abstract fun foo(/*0*/ p0: kotlin.Any!): kotlin.Unit
     }
 
     public trait Super</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ p0: T?): kotlin.Unit
+        public abstract fun foo(/*0*/ p0: T!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt
index b6fc1f31da6..b79a090cbd4 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt
@@ -4,11 +4,11 @@ public trait ReadOnlyToMutable {
 
     public trait Sub : test.ReadOnlyToMutable.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.List<kotlin.String>): kotlin.Unit
+        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ p: kotlin.List<kotlin.String>): kotlin.Unit
+        public abstract fun foo(/*0*/ p: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt
index bb185d71dce..3263a94fd4a 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt
@@ -4,16 +4,16 @@ public trait SubclassFromGenericAndNot {
 
     public trait Generic</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ key: T): kotlin.Unit
+        public abstract fun foo(/*0*/ key: T!): kotlin.Unit
     }
 
     public trait NonGeneric {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ p0: kotlin.String): kotlin.Unit
+        public abstract fun foo(/*0*/ p0: kotlin.String!): kotlin.Unit
     }
 
-    public trait Sub : test.SubclassFromGenericAndNot.NonGeneric, test.SubclassFromGenericAndNot.Generic<kotlin.String> {
+    public trait Sub : test.SubclassFromGenericAndNot.NonGeneric, test.SubclassFromGenericAndNot.Generic<kotlin.String!> {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*2*/ fun foo(/*0*/ key: kotlin.String): kotlin.Unit
+        public abstract override /*2*/ fun foo(/*0*/ key: kotlin.String!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.txt
index 29b462d8d7f..3fbb6722d04 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.txt
@@ -2,13 +2,13 @@ package test
 
 public trait SubstitutedClassParameter {
 
-    public trait Sub : test.SubstitutedClassParameter.Super<kotlin.String> {
+    public trait Sub : test.SubstitutedClassParameter.Super<kotlin.String!> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit
+        public abstract override /*1*/ fun foo(/*0*/ t: kotlin.String!): kotlin.Unit
     }
 
     public trait Super</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ t: T): kotlin.Unit
+        public abstract fun foo(/*0*/ t: T!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.txt
index 24d12a57ebb..603a9b6d7f6 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.txt
@@ -2,18 +2,18 @@ package test
 
 public trait SubstitutedClassParameters {
 
-    public trait Sub : test.SubstitutedClassParameters.Super1<kotlin.String>, test.SubstitutedClassParameters.Super2<kotlin.String> {
+    public trait Sub : test.SubstitutedClassParameters.Super1<kotlin.String!>, test.SubstitutedClassParameters.Super2<kotlin.String!> {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*2*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit
+        public abstract override /*2*/ fun foo(/*0*/ t: kotlin.String!): kotlin.Unit
     }
 
     public trait Super1</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ t: T): kotlin.Unit
+        public abstract fun foo(/*0*/ t: T!): kotlin.Unit
     }
 
     public trait Super2</*0*/ E> {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ t: E): kotlin.Unit
+        public abstract fun foo(/*0*/ t: E!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt
index b47be08e907..96601c107c5 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt
@@ -4,11 +4,11 @@ public trait AddNotNullJavaSubtype {
 
     public trait Sub : test.AddNotNullJavaSubtype.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.String
+        public abstract override /*1*/ fun foo(): kotlin.String!
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.CharSequence?
+        public abstract fun foo(): kotlin.CharSequence!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt
index 9c8ac430929..8ea0bc7028c 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt
@@ -4,11 +4,11 @@ public trait AddNotNullSameJavaType {
 
     public trait Sub : test.AddNotNullSameJavaType.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.CharSequence
+        public abstract override /*1*/ fun foo(): kotlin.CharSequence!
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.CharSequence?
+        public abstract fun foo(): kotlin.CharSequence!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.txt
index 04aa3be6110..15522438fdc 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.txt
@@ -4,11 +4,11 @@ public trait AddNullabilityJavaSubtype {
 
     public trait Sub : test.AddNullabilityJavaSubtype.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.String
+        public abstract override /*1*/ fun foo(): kotlin.String!
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.CharSequence
+        public abstract fun foo(): kotlin.CharSequence!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.txt
index 9d67a3e2eb2..dc172ec4c1b 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.txt
@@ -4,11 +4,11 @@ public trait AddNullabilitySameGenericType1 {
 
     public trait Sub : test.AddNullabilitySameGenericType1.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.MutableList<kotlin.String>
+        public abstract override /*1*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.MutableList<kotlin.String>
+        public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.txt
index 741a239056d..b268dc8174d 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.txt
@@ -4,11 +4,11 @@ public trait AddNullabilitySameGenericType2 {
 
     public trait Sub : test.AddNullabilitySameGenericType2.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.MutableList<kotlin.String>
+        public abstract override /*1*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.MutableList<kotlin.String>
+        public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.txt
index 7a8e6eb18f4..292920194a3 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.txt
@@ -4,11 +4,11 @@ public trait AddNullabilitySameJavaType {
 
     public trait Sub : test.AddNullabilitySameJavaType.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.CharSequence
+        public abstract override /*1*/ fun foo(): kotlin.CharSequence!
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.CharSequence
+        public abstract fun foo(): kotlin.CharSequence!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.txt
index d9ca0b67761..53c34fcda5b 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.txt
@@ -4,11 +4,11 @@ public trait CantMakeImmutableInSubclass {
 
     public trait Sub : test.CantMakeImmutableInSubclass.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.MutableList<kotlin.String>
+        public abstract override /*1*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.MutableCollection<kotlin.String>
+        public abstract fun foo(): kotlin.(Mutable)Collection<kotlin.String!>!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.txt
index d2bd5d3c192..bb872912cc0 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.txt
@@ -2,18 +2,18 @@ package test
 
 public trait DeeplySubstitutedClassParameter {
 
-    public trait Middle</*0*/ E> : test.DeeplySubstitutedClassParameter.Super<E> {
+    public trait Middle</*0*/ E> : test.DeeplySubstitutedClassParameter.Super<E!> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): E
+        public abstract override /*1*/ fun foo(): E!
     }
 
-    public trait Sub : test.DeeplySubstitutedClassParameter.Middle<kotlin.String> {
+    public trait Sub : test.DeeplySubstitutedClassParameter.Middle<kotlin.String!> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.String
+        public abstract override /*1*/ fun foo(): kotlin.String!
     }
 
     public trait Super</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): T
+        public abstract fun foo(): T!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.txt
index aa135b90e49..bc57edf2da1 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.txt
@@ -2,18 +2,18 @@ package test
 
 public trait DeeplySubstitutedClassParameter2 {
 
-    public trait Middle</*0*/ E> : test.DeeplySubstitutedClassParameter2.Super<E> {
+    public trait Middle</*0*/ E> : test.DeeplySubstitutedClassParameter2.Super<E!> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ /*fake_override*/ fun foo(): E
+        public abstract override /*1*/ /*fake_override*/ fun foo(): E!
     }
 
-    public trait Sub : test.DeeplySubstitutedClassParameter2.Middle<kotlin.String> {
+    public trait Sub : test.DeeplySubstitutedClassParameter2.Middle<kotlin.String!> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.String
+        public abstract override /*1*/ fun foo(): kotlin.String!
     }
 
     public trait Super</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): T
+        public abstract fun foo(): T!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt
index c9a06f17937..bc42a6f53b2 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt
@@ -4,35 +4,35 @@ public trait HalfSubstitutedTypeParameters {
 
     public trait Sub : test.HalfSubstitutedTypeParameters.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): test.HalfSubstitutedTypeParameters.TrickyList<kotlin.Int, kotlin.String?>
+        public abstract override /*1*/ fun foo(): test.HalfSubstitutedTypeParameters.TrickyList<kotlin.Int!, kotlin.String!>!
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.MutableList<kotlin.String?>
+        public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
 
-    public trait TrickyList</*0*/ X, /*1*/ E> : kotlin.MutableList<E> {
-        public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: E): kotlin.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: E): kotlin.Unit
-        public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<E>): kotlin.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<E>): kotlin.Boolean
+    public trait TrickyList</*0*/ X, /*1*/ E> : kotlin.MutableList<E!> {
+        public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: E!): kotlin.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: E!): kotlin.Unit
+        public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<E!>): kotlin.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<E!>): kotlin.Boolean
         public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
         public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o: kotlin.Any?): kotlin.Boolean
         public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<kotlin.Any?>): kotlin.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): E
+        public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): E!
         public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int
         public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<E>
+        public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<E!>
         public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int
-        public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<E>
-        public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<E>
+        public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<E!>
+        public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<E!>
         public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.Any?): kotlin.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ index: kotlin.Int): E
+        public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ index: kotlin.Int): E!
         public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<kotlin.Any?>): kotlin.Boolean
         public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<kotlin.Any?>): kotlin.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: E): E
+        public abstract override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: E!): E!
         public abstract override /*1*/ /*fake_override*/ fun size(): kotlin.Int
-        public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<E>
+        public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<E!>
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.txt
index ed2154c4687..7168bf71c4e 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.txt
@@ -4,11 +4,11 @@ public trait InheritNullabilityGenericSubclassSimple {
 
     public trait Sub : test.InheritNullabilityGenericSubclassSimple.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.MutableList<kotlin.String>
+        public abstract override /*1*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.MutableCollection<kotlin.String>
+        public abstract fun foo(): kotlin.(Mutable)Collection<kotlin.String!>!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.txt
index 371d96b0fdb..3fcbf5a0af5 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.txt
@@ -4,11 +4,11 @@ public trait InheritNullabilityJavaSubtype {
 
     public trait Sub : test.InheritNullabilityJavaSubtype.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.String
+        public abstract override /*1*/ fun foo(): kotlin.String!
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.CharSequence
+        public abstract fun foo(): kotlin.CharSequence!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.txt
index 046900e4340..b5c702d04c9 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.txt
@@ -4,11 +4,11 @@ public trait InheritNullabilitySameGenericType {
 
     public trait Sub : test.InheritNullabilitySameGenericType.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.MutableList<kotlin.String>
+        public abstract override /*1*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.MutableList<kotlin.String>
+        public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.txt
index dc7f971d02c..76bf2bada04 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.txt
@@ -4,11 +4,11 @@ public trait InheritNullabilitySameJavaType {
 
     public trait Sub : test.InheritNullabilitySameJavaType.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.CharSequence
+        public abstract override /*1*/ fun foo(): kotlin.CharSequence!
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.CharSequence
+        public abstract fun foo(): kotlin.CharSequence!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritProjectionKind.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritProjectionKind.txt
index d5a6705f372..087d809d9b3 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritProjectionKind.txt
@@ -4,11 +4,11 @@ public trait InheritProjectionKind {
 
     public trait Sub : test.InheritProjectionKind.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.MutableList<out kotlin.Number>
+        public abstract override /*1*/ fun foo(): kotlin.(Mutable)List<kotlin.Number!>!
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.MutableCollection<out kotlin.Number>
+        public abstract fun foo(): kotlin.(Mutable)Collection<kotlin.Number!>!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.txt
index 43b547c2d5c..c66ce430b52 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.txt
@@ -4,11 +4,11 @@ public trait InheritReadOnlinessOfArgument {
 
     public trait Sub : test.InheritReadOnlinessOfArgument.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.List<kotlin.List<kotlin.String>>
+        public abstract override /*1*/ fun foo(): kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.List<kotlin.List<kotlin.String>>
+        public abstract fun foo(): kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.txt
index be5a6e6b3f1..ceaa0428b5f 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.txt
@@ -4,11 +4,11 @@ public trait InheritReadOnlinessSameClass {
 
     public trait Sub : test.InheritReadOnlinessSameClass.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.List<kotlin.String>
+        public abstract override /*1*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.List<kotlin.String>
+        public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.txt
index 0976e7ae10b..9dfd037fc08 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.txt
@@ -4,11 +4,11 @@ public trait InheritReadOnlinessSubclass {
 
     public trait Sub : test.InheritReadOnlinessSubclass.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.List<kotlin.String>
+        public abstract override /*1*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.Collection<kotlin.String>
+        public abstract fun foo(): kotlin.(Mutable)Collection<kotlin.String!>!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SameProjectionKind.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SameProjectionKind.txt
index 01b9da26748..9d8f3340ca5 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SameProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SameProjectionKind.txt
@@ -4,11 +4,11 @@ public trait SameProjectionKind {
 
     public trait Sub : test.SameProjectionKind.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.MutableCollection<out kotlin.Number?>?
+        public abstract override /*1*/ fun foo(): (kotlin.MutableCollection<out kotlin.Number!>..kotlin.Collection<kotlin.Number!>?)
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.MutableCollection<out kotlin.Number?>?
+        public abstract fun foo(): (kotlin.MutableCollection<out kotlin.Number!>..kotlin.Collection<kotlin.Number!>?)
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.txt
index 1f4549c24df..6174110f9ef 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.txt
@@ -4,16 +4,16 @@ public trait SubclassFromGenericAndNot {
 
     public trait Generic</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): T
+        public abstract fun foo(): T!
     }
 
     public trait NonGeneric {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.String?
+        public abstract fun foo(): kotlin.String!
     }
 
-    public trait Sub : test.SubclassFromGenericAndNot.NonGeneric, test.SubclassFromGenericAndNot.Generic<kotlin.String> {
+    public trait Sub : test.SubclassFromGenericAndNot.NonGeneric, test.SubclassFromGenericAndNot.Generic<kotlin.String!> {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*2*/ fun foo(): kotlin.String
+        public abstract override /*2*/ fun foo(): kotlin.String!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.txt
index b91eba675d8..db2c961ebba 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.txt
@@ -1,15 +1,15 @@
 package test
 
-public trait SubclassOfCollection</*0*/ E> : kotlin.MutableCollection<E> {
-    public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: E): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<E>): kotlin.Boolean
+public trait SubclassOfCollection</*0*/ E> : kotlin.MutableCollection<E!> {
+    public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: E!): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<E!>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o: kotlin.Any?): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<kotlin.Any?>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public abstract override /*1*/ fun iterator(): kotlin.MutableIterator<E>
+    public abstract override /*1*/ fun iterator(): kotlin.(Mutable)Iterator<E!>!
     public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.Any?): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<kotlin.Any?>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<kotlin.Any?>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun size(): kotlin.Int
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt
index a97044fa8be..f7207114cc1 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt
@@ -1,7 +1,7 @@
 package test
 
-public trait SubclassOfMapEntry</*0*/ K, /*1*/ V> : kotlin.MutableMap.MutableEntry<K, V> {
-    public abstract override /*1*/ /*fake_override*/ fun getKey(): K
-    public abstract override /*1*/ /*fake_override*/ fun getValue(): V
-    public abstract override /*1*/ fun setValue(/*0*/ value: V): V
-}
+public trait SubclassOfMapEntry</*0*/ K, /*1*/ V> : kotlin.MutableMap.MutableEntry<K!, V!> {
+    public abstract override /*1*/ /*fake_override*/ fun getKey(): K!
+    public abstract override /*1*/ /*fake_override*/ fun getValue(): V!
+    public abstract override /*1*/ fun setValue(/*0*/ value: V!): V!
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameter.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameter.txt
index d6e78ee9766..67f7684c6b4 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameter.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameter.txt
@@ -2,13 +2,13 @@ package test
 
 public trait SubstitutedClassParameter {
 
-    public trait Sub : test.SubstitutedClassParameter.Super<kotlin.String> {
+    public trait Sub : test.SubstitutedClassParameter.Super<kotlin.String!> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.String
+        public abstract override /*1*/ fun foo(): kotlin.String!
     }
 
     public trait Super</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): T
+        public abstract fun foo(): T!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameters.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameters.txt
index 177bba1d7fb..ff0cad0de76 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameters.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameters.txt
@@ -2,18 +2,18 @@ package test
 
 public trait SubstitutedClassParameters {
 
-    public trait Sub : test.SubstitutedClassParameters.Super1<kotlin.String>, test.SubstitutedClassParameters.Super2<kotlin.String> {
+    public trait Sub : test.SubstitutedClassParameters.Super1<kotlin.String!>, test.SubstitutedClassParameters.Super2<kotlin.String!> {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*2*/ fun foo(): kotlin.String
+        public abstract override /*2*/ fun foo(): kotlin.String!
     }
 
     public trait Super1</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): T
+        public abstract fun foo(): T!
     }
 
     public trait Super2</*0*/ E> {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): E
+        public abstract fun foo(): E!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.txt
index 979da14b148..38706e9639b 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.txt
@@ -4,16 +4,16 @@ public trait TwoSuperclassesConflictingProjectionKinds {
 
     public trait Sub : test.TwoSuperclassesConflictingProjectionKinds.Super1, test.TwoSuperclassesConflictingProjectionKinds.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*2*/ fun foo(): kotlin.MutableCollection<kotlin.CharSequence>
+        public abstract override /*2*/ fun foo(): kotlin.(Mutable)Collection<kotlin.CharSequence!>!
     }
 
     public trait Super1 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.MutableCollection<kotlin.CharSequence>
+        public abstract fun foo(): kotlin.(Mutable)Collection<kotlin.CharSequence!>!
     }
 
     public trait Super2 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.MutableCollection<out kotlin.CharSequence>
+        public abstract fun foo(): kotlin.(Mutable)Collection<kotlin.CharSequence!>!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.txt
index b4103e662cf..22ad0eca835 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.txt
@@ -4,16 +4,16 @@ public trait TwoSuperclassesInvariantAndCovariantInferMutability {
 
     public trait Sub : test.TwoSuperclassesInvariantAndCovariantInferMutability.Super1, test.TwoSuperclassesInvariantAndCovariantInferMutability.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*2*/ fun foo(): kotlin.MutableList<kotlin.MutableList<kotlin.String>>
+        public abstract override /*2*/ fun foo(): kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!
     }
 
     public trait Super1 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.List<kotlin.List<kotlin.String>>
+        public abstract fun foo(): kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!
     }
 
     public trait Super2 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.MutableList<kotlin.MutableList<kotlin.String>>
+        public abstract fun foo(): kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt
index 899b3f05d6f..91afe75e7a2 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt
@@ -4,16 +4,16 @@ public trait TwoSuperclassesInvariantAndCovariantInferNullability {
 
     public trait Sub : test.TwoSuperclassesInvariantAndCovariantInferNullability.Super1, test.TwoSuperclassesInvariantAndCovariantInferNullability.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*2*/ fun foo(): kotlin.MutableList<kotlin.String>
+        public abstract override /*2*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
 
     public trait Super1 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.List<kotlin.String?>
+        public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
 
     public trait Super2 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.MutableList<kotlin.String>
+        public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.txt
index f8766e5099b..99bd0496e2c 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.txt
@@ -4,16 +4,16 @@ public trait TwoSuperclassesMutableAndNot {
 
     public trait Sub : test.TwoSuperclassesMutableAndNot.Super1, test.TwoSuperclassesMutableAndNot.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*2*/ fun foo(): kotlin.MutableList<kotlin.String>
+        public abstract override /*2*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
 
     public trait Super1 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.MutableCollection<kotlin.String>
+        public abstract fun foo(): kotlin.(Mutable)Collection<kotlin.String!>!
     }
 
     public trait Super2 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.List<kotlin.String>
+        public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt
index e5118ab022c..85075fdd9e1 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt
@@ -4,16 +4,16 @@ public trait TwoSuperclassesReturnJavaSubtype {
 
     public trait Sub : test.TwoSuperclassesReturnJavaSubtype.Super1, test.TwoSuperclassesReturnJavaSubtype.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*2*/ fun foo(): kotlin.String
+        public abstract override /*2*/ fun foo(): kotlin.String!
     }
 
     public trait Super1 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.CharSequence?
+        public abstract fun foo(): kotlin.CharSequence!
     }
 
     public trait Super2 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.CharSequence
+        public abstract fun foo(): kotlin.CharSequence!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt
index 984264eb3ab..368946f6d20 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt
@@ -4,16 +4,16 @@ public trait TwoSuperclassesReturnSameJavaType {
 
     public trait Sub : test.TwoSuperclassesReturnSameJavaType.Super1, test.TwoSuperclassesReturnSameJavaType.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*2*/ fun foo(): kotlin.CharSequence
+        public abstract override /*2*/ fun foo(): kotlin.CharSequence!
     }
 
     public trait Super1 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.CharSequence?
+        public abstract fun foo(): kotlin.CharSequence!
     }
 
     public trait Super2 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.CharSequence
+        public abstract fun foo(): kotlin.CharSequence!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt
index 4db979aea9a..867395f3c92 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt
@@ -4,16 +4,16 @@ public trait TwoSuperclassesSupplementNotNull {
 
     public trait Sub : test.TwoSuperclassesSupplementNotNull.Super1, test.TwoSuperclassesSupplementNotNull.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*2*/ fun foo(): kotlin.List<kotlin.String>
+        public abstract override /*2*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
 
     public trait Super1 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.List<kotlin.String?>
+        public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
 
     public trait Super2 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.List<kotlin.String>?
+        public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.txt
index a8e6056ab2e..0f787dc2fbf 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.txt
@@ -2,13 +2,13 @@ package test
 
 public trait TypeParamOfClass {
 
-    public trait Sub</*0*/ T> : test.TypeParamOfClass.Super<T> {
+    public trait Sub</*0*/ T> : test.TypeParamOfClass.Super<T!> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): T
+        public abstract override /*1*/ fun foo(): T!
     }
 
     public trait Super</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): T
+        public abstract fun foo(): T!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt
index b24b4900e03..0de1a7cba04 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt
@@ -2,13 +2,13 @@ package test
 
 public trait TypeParamOfClassSubstituted {
 
-    public trait Sub : test.TypeParamOfClassSubstituted.Super<kotlin.String> {
+    public trait Sub : test.TypeParamOfClassSubstituted.Super<kotlin.String!> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.String
+        public abstract override /*1*/ fun foo(): kotlin.String!
     }
 
     public trait Super</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): T
+        public abstract fun foo(): T!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.txt
index 93f004c529b..93af7f3b49d 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.txt
@@ -4,11 +4,11 @@ public trait TypeParamOfFun {
 
     public trait Sub : test.TypeParamOfFun.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun </*0*/ E> foo(): E
+        public abstract override /*1*/ fun </*0*/ E> foo(): E!
     }
 
     public trait Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun </*0*/ T> foo(): T
+        public abstract fun </*0*/ T> foo(): T!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritMutability.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritMutability.txt
index 3df3d6148ef..e741cea467a 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritMutability.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritMutability.txt
@@ -3,10 +3,10 @@ package test
 public trait InheritMutability {
 
     public trait Sub : test.InheritMutability.Super {
-        public abstract override /*1*/ fun </*0*/ B : kotlin.MutableList<kotlin.String>> foo(/*0*/ a: B): kotlin.Unit
+        public abstract override /*1*/ fun </*0*/ B : kotlin.(Mutable)List<kotlin.String!>!> foo(/*0*/ a: B!): kotlin.Unit
     }
 
     public trait Super {
-        public abstract fun </*0*/ A : kotlin.MutableList<kotlin.String>> foo(/*0*/ a: A): kotlin.Unit
+        public abstract fun </*0*/ A : kotlin.(Mutable)List<kotlin.String!>!> foo(/*0*/ a: A!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.txt
index ee84451ab09..5302c5b521d 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.txt
@@ -3,10 +3,10 @@ package test
 public trait InheritNullability {
 
     public trait Sub : test.InheritNullability.Super {
-        public abstract override /*1*/ fun </*0*/ B : kotlin.CharSequence> foo(/*0*/ a: B): kotlin.Unit
+        public abstract override /*1*/ fun </*0*/ B : kotlin.CharSequence!> foo(/*0*/ a: B!): kotlin.Unit
     }
 
     public trait Super {
-        public abstract fun </*0*/ A : kotlin.CharSequence> foo(/*0*/ a: A): kotlin.Unit
+        public abstract fun </*0*/ A : kotlin.CharSequence!> foo(/*0*/ a: A!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt
index 31fb9c78899..f4d2455dda5 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt
@@ -3,10 +3,10 @@ package test
 public trait InheritReadOnliness {
 
     public trait Sub : test.InheritReadOnliness.Super {
-        public abstract override /*1*/ fun </*0*/ B : kotlin.List<kotlin.String>> foo(/*0*/ a: B): kotlin.Unit
+        public abstract override /*1*/ fun </*0*/ B : kotlin.(Mutable)List<kotlin.String!>!> foo(/*0*/ a: B!): kotlin.Unit
     }
 
     public trait Super {
-        public abstract fun </*0*/ A : kotlin.List<kotlin.String>> foo(/*0*/ a: A): kotlin.Unit
+        public abstract fun </*0*/ A : kotlin.(Mutable)List<kotlin.String!>!> foo(/*0*/ a: A!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.txt
index 088088c39b9..d17e66e308d 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.txt
@@ -3,10 +3,10 @@ package test
 public trait TwoBounds {
 
     public trait Sub : test.TwoBounds.Super {
-        public abstract override /*1*/ fun </*0*/ B : kotlin.CharSequence> foo(/*0*/ a: B): kotlin.Unit where B : kotlin.Cloneable
+        public abstract override /*1*/ fun </*0*/ B : kotlin.CharSequence!> foo(/*0*/ a: B!): kotlin.Unit where B : kotlin.Cloneable!
     }
 
     public trait Super {
-        public abstract fun </*0*/ A : kotlin.CharSequence> foo(/*0*/ a: A): kotlin.Unit where A : kotlin.Cloneable
+        public abstract fun </*0*/ A : kotlin.CharSequence!> foo(/*0*/ a: A!): kotlin.Unit where A : kotlin.Cloneable!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt
index efba57c8f95..7059ed0d3a6 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt
@@ -3,14 +3,14 @@ package test
 public trait TwoSuperclasses {
 
     public trait Sub : test.TwoSuperclasses.Super1, test.TwoSuperclasses.Super2 {
-        public abstract override /*2*/ fun </*0*/ C : kotlin.CharSequence> foo(/*0*/ a: C): kotlin.Unit
+        public abstract override /*2*/ fun </*0*/ C : kotlin.CharSequence!> foo(/*0*/ a: C!): kotlin.Unit
     }
 
     public trait Super1 {
-        public abstract fun </*0*/ A : kotlin.CharSequence> foo(/*0*/ a: A): kotlin.Unit
+        public abstract fun </*0*/ A : kotlin.CharSequence!> foo(/*0*/ a: A!): kotlin.Unit
     }
 
     public trait Super2 {
-        public abstract fun </*0*/ B : kotlin.CharSequence> foo(/*0*/ a: B): kotlin.Unit
+        public abstract fun </*0*/ B : kotlin.CharSequence!> foo(/*0*/ a: B!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt
index 6e9f31a72a9..243f8b878f0 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt
@@ -3,10 +3,10 @@ package test
 public trait TwoTypeParameters {
 
     public trait Sub : test.TwoTypeParameters.Super {
-        public abstract override /*1*/ fun </*0*/ B : kotlin.CharSequence, /*1*/ A : kotlin.Cloneable> foo(/*0*/ a: B, /*1*/ b: A): kotlin.Unit
+        public abstract override /*1*/ fun </*0*/ B : kotlin.CharSequence!, /*1*/ A : kotlin.Cloneable!> foo(/*0*/ a: B!, /*1*/ b: A!): kotlin.Unit
     }
 
     public trait Super {
-        public abstract fun </*0*/ A : kotlin.CharSequence, /*1*/ B : kotlin.Cloneable> foo(/*0*/ a: A, /*1*/ b: B): kotlin.Unit
+        public abstract fun </*0*/ A : kotlin.CharSequence!, /*1*/ B : kotlin.Cloneable!> foo(/*0*/ a: A!, /*1*/ b: B!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt
index 3c1a244c604..dddc80dd434 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt
@@ -3,10 +3,10 @@ package test
 public trait UseParameterAsUpperBound {
 
     public trait Sub : test.UseParameterAsUpperBound.Super {
-        public abstract override /*1*/ fun </*0*/ B, /*1*/ A : B> foo(/*0*/ a: B, /*1*/ b: A): kotlin.Unit
+        public abstract override /*1*/ fun </*0*/ B, /*1*/ A : B!> foo(/*0*/ a: B!, /*1*/ b: A!): kotlin.Unit
     }
 
     public trait Super {
-        public abstract fun </*0*/ A, /*1*/ B : A> foo(/*0*/ a: A, /*1*/ b: B): kotlin.Unit
+        public abstract fun </*0*/ A, /*1*/ B : A!> foo(/*0*/ a: A!, /*1*/ b: B!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt
index e84b3ad4977..f56d32569f4 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt
@@ -3,10 +3,10 @@ package test
 public trait UseParameterInUpperBound {
 
     public trait Sub : test.UseParameterInUpperBound.Super {
-        public abstract override /*1*/ fun </*0*/ B, /*1*/ A : kotlin.List<B>> foo(/*0*/ a: B, /*1*/ b: A): kotlin.Unit
+        public abstract override /*1*/ fun </*0*/ B, /*1*/ A : kotlin.(Mutable)List<B!>!> foo(/*0*/ a: B!, /*1*/ b: A!): kotlin.Unit
     }
 
     public trait Super {
-        public abstract fun </*0*/ A, /*1*/ B : kotlin.List<A>> foo(/*0*/ a: A, /*1*/ b: B): kotlin.Unit
+        public abstract fun </*0*/ A, /*1*/ B : kotlin.(Mutable)List<A!>!> foo(/*0*/ a: A!, /*1*/ b: B!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt
index f1b548ae9a2..d10e7689168 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt
@@ -3,10 +3,10 @@ package test
 public trait UseParameterInUpperBoundWithKotlinSignature {
 
     public trait Sub : test.UseParameterInUpperBoundWithKotlinSignature.Super {
-        public abstract override /*1*/ fun </*0*/ B, /*1*/ A : kotlin.List<B>> foo(/*0*/ b: B, /*1*/ a: A): kotlin.Unit
+        public abstract override /*1*/ fun </*0*/ B, /*1*/ A : kotlin.(Mutable)List<B!>!> foo(/*0*/ b: B!, /*1*/ a: A!): kotlin.Unit
     }
 
     public trait Super {
-        public abstract fun </*0*/ A, /*1*/ B : kotlin.List<A>> foo(/*0*/ a: A, /*1*/ b: B): kotlin.Unit
+        public abstract fun </*0*/ A, /*1*/ B : kotlin.(Mutable)List<A!>!> foo(/*0*/ a: A!, /*1*/ b: B!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/library/LoadIterable.txt b/compiler/testData/loadJava/compiledJava/library/LoadIterable.txt
index 60e4d7a8992..b333cae51ec 100644
--- a/compiler/testData/loadJava/compiledJava/library/LoadIterable.txt
+++ b/compiler/testData/loadJava/compiledJava/library/LoadIterable.txt
@@ -3,4 +3,4 @@ package test
 public trait LoadIterable</*0*/ T> {
     public abstract fun getIterable(): kotlin.(Mutable)Iterable<T!>!
     public abstract fun setIterable(/*0*/ p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/library/LoadIterator.txt b/compiler/testData/loadJava/compiledJava/library/LoadIterator.txt
index a0353e2a5e7..20f8bbbce71 100644
--- a/compiler/testData/loadJava/compiledJava/library/LoadIterator.txt
+++ b/compiler/testData/loadJava/compiledJava/library/LoadIterator.txt
@@ -3,4 +3,4 @@ package test
 public trait LoadIterator</*0*/ T> {
     public abstract fun getIterator(): kotlin.(Mutable)Iterator<T!>!
     public abstract fun setIterator(/*0*/ p0: kotlin.(Mutable)Iterator<T!>!): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/library/Max.txt b/compiler/testData/loadJava/compiledJava/library/Max.txt
index 5f6467ee76a..eb90b62b6d6 100644
--- a/compiler/testData/loadJava/compiledJava/library/Max.txt
+++ b/compiler/testData/loadJava/compiledJava/library/Max.txt
@@ -3,4 +3,4 @@ package test
 public open class Max {
     public constructor Max()
     public open fun </*0*/ T : kotlin.Any!> max(/*0*/ p0: (kotlin.MutableCollection<out T!>..kotlin.Collection<T!>?)): T! where T : kotlin.Comparable<T!>!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.txt b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.txt
index d0957405265..7f81c6a2ba3 100644
--- a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.txt
+++ b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.txt
@@ -28,5 +28,5 @@ public open class ModalityOfFakeOverrides : java.util.AbstractList<kotlin.String
     public open override /*1*/ fun size(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.(Mutable)List<kotlin.String!>!
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
-    public open override /*1*/ /*fake_override*/ fun </*0*/ T> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
-}
+    public open override /*1*/ /*fake_override*/ fun </*0*/ T> toArray(/*0*/ a: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.txt
index 2e945fe6593..ea22778e9f3 100644
--- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.txt
+++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.txt
@@ -5,4 +5,4 @@ public trait LoadIterable</*0*/ T> {
     org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.(Mutable)Iterable<T!>!
     public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit
     public abstract fun setReadOnlyIterable(/*0*/ org.jetbrains.annotations.ReadOnly() p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.txt
index 025cc9c0b0f..06a56f86707 100644
--- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.txt
+++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.txt
@@ -3,4 +3,4 @@ package test
 public trait LoadIterableWithConflict</*0*/ T> {
     org.jetbrains.annotations.ReadOnly() org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.(Mutable)Iterable<T!>!
     public abstract fun setIterable(/*0*/ org.jetbrains.annotations.ReadOnly() org.jetbrains.annotations.Mutable() p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.txt
index e2d3dbf41df..6e2b4e22c1c 100644
--- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.txt
+++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.txt
@@ -5,4 +5,4 @@ public trait LoadIterableWithNullability</*0*/ T> {
     org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.(Mutable)Iterable<T!>!
     public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit
     public abstract fun setReadOnlyIterable(/*0*/ org.jetbrains.annotations.ReadOnly() p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.txt
index 7523e927545..04f791b03e4 100644
--- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.txt
+++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.txt
@@ -16,4 +16,4 @@ public trait LoadIterableWithPropagation {
         public open override /*1*/ fun setIterable(/*0*/ p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit
         public open override /*1*/ fun setReadOnlyIterable(/*0*/ p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullField.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullField.txt
index 007cf0aaf12..74cde22aa6e 100644
--- a/compiler/testData/loadJava/compiledJava/notNull/NotNullField.txt
+++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullField.txt
@@ -3,4 +3,4 @@ package test
 public open class NotNullField {
     public constructor NotNullField()
     public final var hi: kotlin.String!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.txt
index 3d622bcfffd..a2d07e4d2ab 100644
--- a/compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.txt
+++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.txt
@@ -3,4 +3,4 @@ package test
 public open class NotNullIntArray {
     public constructor NotNullIntArray()
     public open fun hi(): kotlin.IntArray!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.txt
index 5e96c225d22..60bea54eb8b 100644
--- a/compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.txt
+++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.txt
@@ -3,4 +3,4 @@ package test
 public open class NotNullMethod {
     public constructor NotNullMethod()
     public open fun hi(): kotlin.String!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.txt
index f68a191bcf8..1cfe99e7f3a 100644
--- a/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.txt
+++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.txt
@@ -3,4 +3,4 @@ package test
 public open class NotNullObjectArray {
     public constructor NotNullObjectArray()
     public open fun hi(): kotlin.Array<(out) kotlin.Any!>!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.txt
index c58ff0f2937..b88bdda26a3 100644
--- a/compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.txt
+++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.txt
@@ -3,4 +3,4 @@ package test
 public open class NotNullParameter {
     public constructor NotNullParameter()
     public open fun hi(/*0*/ p0: kotlin.String!): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageConstructor.txt b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageConstructor.txt
index a0e229ec8da..f86d8104c30 100644
--- a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageConstructor.txt
+++ b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageConstructor.txt
@@ -6,4 +6,4 @@ public open class ProtectedPackageConstructor {
     protected/*protected static*/ open class Foo {
         protected/*protected and package*/ constructor Foo()
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.txt b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.txt
index c39445fb8d2..129b088bbd0 100644
--- a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.txt
+++ b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.txt
@@ -3,4 +3,4 @@ package test
 public open class ProtectedPackageFun {
     public constructor ProtectedPackageFun()
     protected/*protected and package*/ open fun foo(): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.txt b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.txt
index 85268b6f9bf..e3e19015991 100644
--- a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.txt
+++ b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.txt
@@ -3,4 +3,4 @@ package test
 public open class ProtectedPackageProperty {
     public constructor ProtectedPackageProperty()
     protected/*protected and package*/ final var foo: kotlin.Int
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/protectedStatic/ConstructorInProtectedStaticNestedClass.txt b/compiler/testData/loadJava/compiledJava/protectedStatic/ConstructorInProtectedStaticNestedClass.txt
index 9e7b4fdd5d1..8ab8817031d 100644
--- a/compiler/testData/loadJava/compiledJava/protectedStatic/ConstructorInProtectedStaticNestedClass.txt
+++ b/compiler/testData/loadJava/compiledJava/protectedStatic/ConstructorInProtectedStaticNestedClass.txt
@@ -6,4 +6,4 @@ public open class ConstructorInProtectedStaticNestedClass {
     protected/*protected static*/ open class Inner {
         protected/*protected and package*/ constructor Inner()
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/Comparator.txt b/compiler/testData/loadJava/compiledJava/sam/Comparator.txt
index 6fd478c32a4..12fa2bfd3b6 100644
--- a/compiler/testData/loadJava/compiledJava/sam/Comparator.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/Comparator.txt
@@ -4,4 +4,4 @@ public /*synthesized*/ fun </*0*/ T> Comparator(/*0*/ function: (T!, T!) -> kotl
 
 public trait Comparator</*0*/ T> {
     public abstract fun compare(/*0*/ p0: T!, /*1*/ p1: T!): kotlin.Int
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.txt b/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.txt
index 6085a6c4b86..d2a0669fafe 100644
--- a/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.txt
@@ -4,4 +4,4 @@ public /*synthesized*/ fun FilenameFilter(/*0*/ function: (java.io.File!, kotlin
 
 public trait FilenameFilter {
     public abstract fun accept(/*0*/ p0: java.io.File!, /*1*/ p1: kotlin.String!): kotlin.Boolean
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.txt b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.txt
index 04c323b6459..a99740c3f41 100644
--- a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.txt
@@ -4,4 +4,4 @@ public /*synthesized*/ fun </*0*/ T : test.GenericInterfaceParameterWithSelfBoun
 
 public trait GenericInterfaceParameterWithSelfBound</*0*/ T : test.GenericInterfaceParameterWithSelfBound<T!>!> {
     public abstract fun method(/*0*/ p0: T!): T!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.txt b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.txt
index ed9c8a36b6a..b125c60ae0d 100644
--- a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.txt
@@ -4,4 +4,4 @@ public /*synthesized*/ fun </*0*/ A : kotlin.Comparable<A!>!, /*1*/ B : kotlin.(
 
 public trait GenericInterfaceParametersWithBounds</*0*/ A : kotlin.Comparable<A!>!, /*1*/ B : kotlin.(Mutable)List<A!>!> where A : kotlin.Cloneable! {
     public abstract fun method(/*0*/ p0: kotlin.Array<(out) A!>!, /*1*/ p1: B!): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.txt b/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.txt
index 426b9a2fcab..e73d56aeca0 100644
--- a/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.txt
@@ -2,4 +2,4 @@ package test
 
 public trait GenericMethodParameters {
     public abstract fun </*0*/ A : kotlin.CharSequence!, /*1*/ B : kotlin.(Mutable)List<A!>!> method(/*0*/ p0: kotlin.Array<(out) A!>!, /*1*/ p1: B!): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.txt b/compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.txt
index 7727fe5cdbd..38f4e869326 100644
--- a/compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.txt
@@ -1,4 +1,4 @@
 package test
 
 public trait InterfaceWithObjectMethod {
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/Nested.txt b/compiler/testData/loadJava/compiledJava/sam/Nested.txt
index 3e3888db240..0c5998b7b18 100644
--- a/compiler/testData/loadJava/compiledJava/sam/Nested.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/Nested.txt
@@ -1,29 +1,29 @@
 package test
 
 public trait Nested {
-    
+
     public trait Deeper1 {
-        
+
         public trait Runnable {
             public abstract fun run(): kotlin.Unit
             public abstract fun run2(): kotlin.Unit
         }
     }
-    
+
     public trait Deeper2 {
-        
+
         public trait Runnable {
             public abstract fun run(): kotlin.Unit
         }
-        
+
         // Static members
         public final /*synthesized*/ fun Runnable(/*0*/ function: () -> kotlin.Unit): test.Nested.Deeper2.Runnable
     }
-    
+
     public trait Runnable {
         public abstract fun run(): kotlin.Unit
     }
-    
+
     // Static members
     public final /*synthesized*/ fun Runnable(/*0*/ function: () -> kotlin.Unit): test.Nested.Runnable
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/Runnable.txt b/compiler/testData/loadJava/compiledJava/sam/Runnable.txt
index 825a213b0b4..ed966d962ea 100644
--- a/compiler/testData/loadJava/compiledJava/sam/Runnable.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/Runnable.txt
@@ -4,4 +4,4 @@ public /*synthesized*/ fun Runnable(/*0*/ function: () -> kotlin.Unit): test.Run
 
 public trait Runnable {
     public abstract fun run(): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.txt b/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.txt
index c46effcefe9..bde20775319 100644
--- a/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.txt
@@ -5,17 +5,17 @@ public trait SamSubinterfaceOfTwo {
     public trait Sub : test.SamSubinterfaceOfTwo.Super1, test.SamSubinterfaceOfTwo.Super2<kotlin.String!> {
         public abstract override /*2*/ /*fake_override*/ fun f(): kotlin.String!
     }
-    
+
     public trait Super1 {
         public abstract fun f(): kotlin.CharSequence!
     }
-    
+
     public trait Super2</*0*/ T> {
         public abstract fun f(): T!
     }
-    
+
     // Static members
-    public /*synthesized*/ fun Sub(/*0*/ function: () -> kotlin.String!): test.SamSubinterfaceOfTwo.Sub
-    public /*synthesized*/ fun Super1(/*0*/ function: () -> kotlin.CharSequence!): test.SamSubinterfaceOfTwo.Super1
-    public /*synthesized*/ fun </*0*/ T> Super2(/*0*/ function: () -> T!): test.SamSubinterfaceOfTwo.Super2<T>
-}
+    public final /*synthesized*/ fun Sub(/*0*/ function: () -> kotlin.String!): test.SamSubinterfaceOfTwo.Sub
+    public final /*synthesized*/ fun Super1(/*0*/ function: () -> kotlin.CharSequence!): test.SamSubinterfaceOfTwo.Super1
+    public final /*synthesized*/ fun </*0*/ T> Super2(/*0*/ function: () -> T!): test.SamSubinterfaceOfTwo.Super2<T>
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOverridding.txt b/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOverridding.txt
index d30c2bf84fe..2c895725481 100644
--- a/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOverridding.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOverridding.txt
@@ -4,4 +4,4 @@ public /*synthesized*/ fun SamSubinterfaceOverridding(/*0*/ function: () -> kotl
 
 public trait SamSubinterfaceOverridding : java.lang.Runnable {
     public abstract override /*1*/ fun run(): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.txt b/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.txt
index 4e465e7fefa..11846d49422 100644
--- a/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.txt
@@ -4,4 +4,4 @@ public /*synthesized*/ fun SubstitutedSamInterface(/*0*/ function: (kotlin.Strin
 
 public trait SubstitutedSamInterface : java.util.Comparator<kotlin.String!> {
     public abstract override /*1*/ /*fake_override*/ fun compare(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.String!): kotlin.Int
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.txt b/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.txt
index 7103eb80b8b..ff9e210d8ff 100644
--- a/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.txt
@@ -4,4 +4,4 @@ public /*synthesized*/ fun SubstitutedSamInterfaceSubclassOfBuiltin(/*0*/ functi
 
 public trait SubstitutedSamInterfaceSubclassOfBuiltin : kotlin.Comparable<test.SubstitutedSamInterfaceSubclassOfBuiltin!> {
     public abstract override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.SubstitutedSamInterfaceSubclassOfBuiltin!): kotlin.Int
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/VarargParameter.txt b/compiler/testData/loadJava/compiledJava/sam/VarargParameter.txt
index a6c513dcbad..10301a73b36 100644
--- a/compiler/testData/loadJava/compiledJava/sam/VarargParameter.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/VarargParameter.txt
@@ -4,4 +4,4 @@ public /*synthesized*/ fun VarargParameter(/*0*/ function: (kotlin.Array<(out) k
 
 public trait VarargParameter {
     public abstract fun f(/*0*/ vararg p0: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.txt
index 67cd27aa493..812e004c5a4 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.txt
@@ -6,4 +6,4 @@ public open class AmbiguousAdapters {
     public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
     public open fun foo(/*0*/ p0: java.io.Closeable!): kotlin.Unit
     public open fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.txt
index 9efc9eb02fd..01e05695fd5 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.txt
@@ -6,6 +6,6 @@ public open class Basic {
     public open fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
 
     // Static members
-    public /*synthesized*/ fun bar(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
+    public final /*synthesized*/ fun bar(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
     public open fun bar(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.txt
index f85e89a2c92..bdff6496804 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.txt
@@ -3,4 +3,4 @@ package test
 public open class Constructor {
     public /*synthesized*/ constructor Constructor(/*0*/ p0: (() -> kotlin.Unit)!)
     public constructor Constructor(/*0*/ p0: java.lang.Runnable!)
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.txt
index 486644c6f33..b026896fb84 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.txt
@@ -1,18 +1,18 @@
 package test
 
 public trait DeepSamLoop {
-    
+
     public trait Bar {
         public final /*synthesized*/ fun foo(/*0*/ p0: ((test.DeepSamLoop.Bar!) -> kotlin.Unit)!): kotlin.Unit
         public abstract fun foo(/*0*/ p0: test.DeepSamLoop.Foo!): kotlin.Unit
     }
-    
+
     public trait Foo {
         public final /*synthesized*/ fun foo(/*0*/ p0: ((test.DeepSamLoop.Foo!) -> kotlin.Unit)!): kotlin.Unit
         public abstract fun foo(/*0*/ p0: test.DeepSamLoop.Bar!): kotlin.Unit
     }
-    
+
     // Static members
-    public /*synthesized*/ fun Bar(/*0*/ function: (test.DeepSamLoop.Foo!) -> kotlin.Unit): test.DeepSamLoop.Bar
-    public /*synthesized*/ fun Foo(/*0*/ function: (test.DeepSamLoop.Bar!) -> kotlin.Unit): test.DeepSamLoop.Foo
-}
+    public final /*synthesized*/ fun Bar(/*0*/ function: (test.DeepSamLoop.Foo!) -> kotlin.Unit): test.DeepSamLoop.Bar
+    public final /*synthesized*/ fun Foo(/*0*/ function: (test.DeepSamLoop.Bar!) -> kotlin.Unit): test.DeepSamLoop.Foo
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.txt
index e8338dfd6b2..6cbd8394b69 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.txt
@@ -9,4 +9,4 @@ public open class NonTrivialFunctionType {
     public final /*synthesized*/ fun wildcardBound(/*0*/ p0: ((kotlin.CharSequence!, kotlin.CharSequence!) -> kotlin.Int)!): kotlin.Unit
     public open fun wildcardBound(/*0*/ p0: java.util.Comparator<in kotlin.CharSequence!>!): kotlin.Unit
     public open fun wildcardUnbound(/*0*/ p0: java.util.Comparator<out kotlin.Any?>!): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.txt
index 0167719076f..6549e85acab 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.txt
@@ -5,4 +5,4 @@ public /*synthesized*/ fun SelfAsParameter(/*0*/ function: (test.SelfAsParameter
 public trait SelfAsParameter {
     public final /*synthesized*/ fun foo(/*0*/ p0: ((test.SelfAsParameter!) -> kotlin.Unit)!): kotlin.Unit
     public abstract fun foo(/*0*/ p0: test.SelfAsParameter!): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.txt
index eb138e1c392..2c4ad6efc63 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.txt
@@ -2,8 +2,8 @@ package test
 
 public open class SeveralSamParameters {
     public constructor SeveralSamParameters()
-    
+
     // Static members
-    public /*synthesized*/ fun findMaxAndInvokeCallback(/*0*/ p0: ((kotlin.String!, kotlin.String!) -> kotlin.Int)!, /*1*/ p1: kotlin.String!, /*2*/ p2: kotlin.String!, /*3*/ p3: (() -> kotlin.Unit)!): kotlin.String!
+    public final /*synthesized*/ fun findMaxAndInvokeCallback(/*0*/ p0: ((kotlin.String!, kotlin.String!) -> kotlin.Int)!, /*1*/ p1: kotlin.String!, /*2*/ p2: kotlin.String!, /*3*/ p3: (() -> kotlin.Unit)!): kotlin.String!
     public open fun findMaxAndInvokeCallback(/*0*/ p0: java.util.Comparator<kotlin.String!>!, /*1*/ p1: kotlin.String!, /*2*/ p2: kotlin.String!, /*3*/ p3: java.lang.Runnable!): kotlin.String!
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.txt
index 41b399cb364..a4d40b7d592 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.txt
@@ -4,4 +4,4 @@ public open class TypeParameterOfClass</*0*/ T> {
     public constructor TypeParameterOfClass</*0*/ T>()
     public final /*synthesized*/ fun foo(/*0*/ p0: ((T!, T!) -> kotlin.Int)!): kotlin.Unit
     public open fun foo(/*0*/ p0: java.util.Comparator<T!>!): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.txt
index c5700bab832..5b988d20022 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.txt
@@ -2,12 +2,12 @@ package test
 
 public open class TypeParameterOfMethod {
     public constructor TypeParameterOfMethod()
-    
+
     // Static members
-    public /*synthesized*/ fun </*0*/ T> max(/*0*/ p0: ((T!, T!) -> kotlin.Int)!, /*1*/ p1: T!, /*2*/ p2: T!): T!
+    public final /*synthesized*/ fun </*0*/ T> max(/*0*/ p0: ((T!, T!) -> kotlin.Int)!, /*1*/ p1: T!, /*2*/ p2: T!): T!
     public open fun </*0*/ T> max(/*0*/ p0: java.util.Comparator<T!>!, /*1*/ p1: T!, /*2*/ p2: T!): T!
-    public /*synthesized*/ fun </*0*/ T : kotlin.CharSequence!> max2(/*0*/ p0: ((T!, T!) -> kotlin.Int)!, /*1*/ p1: T!, /*2*/ p2: T!): T!
+    public final /*synthesized*/ fun </*0*/ T : kotlin.CharSequence!> max2(/*0*/ p0: ((T!, T!) -> kotlin.Int)!, /*1*/ p1: T!, /*2*/ p2: T!): T!
     public open fun </*0*/ T : kotlin.CharSequence!> max2(/*0*/ p0: java.util.Comparator<T!>!, /*1*/ p1: T!, /*2*/ p2: T!): T!
-    public /*synthesized*/ fun </*0*/ A : kotlin.CharSequence!, /*1*/ B : kotlin.(Mutable)List<A!>!> method(/*0*/ p0: ((A!, A!) -> kotlin.Int)!, /*1*/ p1: B!): kotlin.Unit
+    public final /*synthesized*/ fun </*0*/ A : kotlin.CharSequence!, /*1*/ B : kotlin.(Mutable)List<A!>!> method(/*0*/ p0: ((A!, A!) -> kotlin.Int)!, /*1*/ p1: B!): kotlin.Unit
     public open fun </*0*/ A : kotlin.CharSequence!, /*1*/ B : kotlin.(Mutable)List<A!>!> method(/*0*/ p0: java.util.Comparator<A!>!, /*1*/ p1: B!): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.txt
index 2cc5708f804..0793dbf78ba 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.txt
@@ -8,4 +8,4 @@ public open class TypeParameterOfOuterClass</*0*/ T> {
         public final /*synthesized*/ fun foo(/*0*/ p0: ((T!, T!) -> kotlin.Int)!): kotlin.Unit
         public open fun foo(/*0*/ p0: java.util.Comparator<T!>!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.txt
index f76631190fd..b83061b10c3 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.txt
@@ -1,17 +1,17 @@
 package test
 
 public trait AdapterDoesntOverrideDeclaration {
-    
+
     public trait Sub : test.AdapterDoesntOverrideDeclaration.Super {
         public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit!)!): kotlin.Unit
         public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
         public abstract fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
     }
-    
+
     public trait Super {
         public abstract fun foo(/*0*/ p0: (() -> kotlin.Unit!)!): kotlin.Unit
     }
-    
+
     // Static members
-    public /*synthesized*/ fun Super(/*0*/ function: ((() -> kotlin.Unit!)!) -> kotlin.Unit): test.AdapterDoesntOverrideDeclaration.Super
-}
+    public final /*synthesized*/ fun Super(/*0*/ function: ((() -> kotlin.Unit!)!) -> kotlin.Unit): test.AdapterDoesntOverrideDeclaration.Super
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.txt
index d41e90271e4..8c1be41eaf0 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.txt
@@ -13,4 +13,4 @@ public trait InheritedAdapterAndDeclaration {
         public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
         public abstract fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.txt
index 85b21f7a92c..ed70ad5da11 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.txt
@@ -15,4 +15,4 @@ public trait InheritedAmbiguousAdapters {
         public abstract fun foo(/*0*/ p0: java.io.Closeable!): kotlin.Unit
         public abstract fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.txt
index d26fcd92cfc..8eedb1445eb 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.txt
@@ -15,4 +15,4 @@ public trait InheritedAndOverriddenAmbiguousAdapters {
         public abstract fun foo(/*0*/ p0: java.io.Closeable!): kotlin.Unit
         public abstract fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.txt
index 56df91abef0..27d9b2ddd21 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.txt
@@ -13,4 +13,4 @@ public trait InheritedOverridden {
         public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
         public open fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.txt
index 42b12e26641..0a627b5ae80 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.txt
@@ -13,4 +13,4 @@ public trait InheritedOverriddenAdapter {
         public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
         public open fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.txt
index 655dcb3b2f3..adebdb11e85 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.txt
@@ -1,24 +1,24 @@
 package test
 
 public trait InheritedSameAdapters {
-    
+
     public trait Sub : test.InheritedSameAdapters.Super1, test.InheritedSameAdapters.Super2 {
         public final override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
         public abstract override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
     }
-    
+
     public trait Super1 {
         public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
         public abstract fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
     }
-    
+
     public trait Super2 {
         public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
         public abstract fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
     }
-    
+
     // Static members
-    public /*synthesized*/ fun Sub(/*0*/ function: (java.lang.Runnable!) -> kotlin.Unit): test.InheritedSameAdapters.Sub
-    public /*synthesized*/ fun Super1(/*0*/ function: (java.lang.Runnable!) -> kotlin.Unit): test.InheritedSameAdapters.Super1
-    public /*synthesized*/ fun Super2(/*0*/ function: (java.lang.Runnable!) -> kotlin.Unit): test.InheritedSameAdapters.Super2
-}
+    public final /*synthesized*/ fun Sub(/*0*/ function: (java.lang.Runnable!) -> kotlin.Unit): test.InheritedSameAdapters.Sub
+    public final /*synthesized*/ fun Super1(/*0*/ function: (java.lang.Runnable!) -> kotlin.Unit): test.InheritedSameAdapters.Super1
+    public final /*synthesized*/ fun Super2(/*0*/ function: (java.lang.Runnable!) -> kotlin.Unit): test.InheritedSameAdapters.Super2
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.txt
index fc889678c52..302d2c53b07 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.txt
@@ -1,17 +1,17 @@
 package test
 
 public trait InheritedSameAdaptersWithSubstitution {
-    
+
     public trait Sub : test.InheritedSameAdaptersWithSubstitution.Super1, test.InheritedSameAdaptersWithSubstitution.Super2Substituted {
         public final override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: ((kotlin.String!, kotlin.String!) -> kotlin.Int)!): kotlin.Unit
         public abstract override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: java.util.Comparator<kotlin.String!>!): kotlin.Unit
     }
-    
+
     public trait Super1 {
         public final /*synthesized*/ fun foo(/*0*/ p0: ((kotlin.String!, kotlin.String!) -> kotlin.Int)!): kotlin.Unit
         public abstract fun foo(/*0*/ p0: java.util.Comparator<kotlin.String!>!): kotlin.Unit
     }
-    
+
     public trait Super2</*0*/ T> {
         public final /*synthesized*/ fun foo(/*0*/ p0: ((T!, T!) -> kotlin.Int)!): kotlin.Unit
         public abstract fun foo(/*0*/ p0: java.util.Comparator<T!>!): kotlin.Unit
@@ -21,10 +21,10 @@ public trait InheritedSameAdaptersWithSubstitution {
         public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: ((kotlin.String!, kotlin.String!) -> kotlin.Int)!): kotlin.Unit
         public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.util.Comparator<kotlin.String!>!): kotlin.Unit
     }
-    
+
     // Static members
-    public /*synthesized*/ fun Sub(/*0*/ function: (java.util.Comparator<kotlin.String!>!) -> kotlin.Unit): test.InheritedSameAdaptersWithSubstitution.Sub
-    public /*synthesized*/ fun Super1(/*0*/ function: (java.util.Comparator<kotlin.String!>!) -> kotlin.Unit): test.InheritedSameAdaptersWithSubstitution.Super1
-    public /*synthesized*/ fun </*0*/ T> Super2(/*0*/ function: (java.util.Comparator<T!>!) -> kotlin.Unit): test.InheritedSameAdaptersWithSubstitution.Super2<T>
-    public /*synthesized*/ fun Super2Substituted(/*0*/ function: (java.util.Comparator<kotlin.String!>!) -> kotlin.Unit): test.InheritedSameAdaptersWithSubstitution.Super2Substituted
-}
+    public final /*synthesized*/ fun Sub(/*0*/ function: (java.util.Comparator<kotlin.String!>!) -> kotlin.Unit): test.InheritedSameAdaptersWithSubstitution.Sub
+    public final /*synthesized*/ fun Super1(/*0*/ function: (java.util.Comparator<kotlin.String!>!) -> kotlin.Unit): test.InheritedSameAdaptersWithSubstitution.Super1
+    public final /*synthesized*/ fun </*0*/ T> Super2(/*0*/ function: (java.util.Comparator<T!>!) -> kotlin.Unit): test.InheritedSameAdaptersWithSubstitution.Super2<T>
+    public final /*synthesized*/ fun Super2Substituted(/*0*/ function: (java.util.Comparator<kotlin.String!>!) -> kotlin.Unit): test.InheritedSameAdaptersWithSubstitution.Super2Substituted
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.txt
index c7111364b59..71087a9fff6 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.txt
@@ -1,18 +1,18 @@
 package test
 
 public trait InheritedSimple {
-    
+
     public trait Sub : test.InheritedSimple.Super {
         public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
         public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
     }
-    
+
     public trait Super {
         public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
         public abstract fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
     }
-    
+
     // Static members
-    public /*synthesized*/ fun Sub(/*0*/ function: (java.lang.Runnable!) -> kotlin.Unit): test.InheritedSimple.Sub
-    public /*synthesized*/ fun Super(/*0*/ function: (java.lang.Runnable!) -> kotlin.Unit): test.InheritedSimple.Super
-}
+    public final /*synthesized*/ fun Sub(/*0*/ function: (java.lang.Runnable!) -> kotlin.Unit): test.InheritedSimple.Sub
+    public final /*synthesized*/ fun Super(/*0*/ function: (java.lang.Runnable!) -> kotlin.Unit): test.InheritedSimple.Super
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.txt
index 153434ee896..77989e499ab 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.txt
@@ -14,4 +14,4 @@ public trait OverriddenAmbiguousAdapters {
         public abstract fun foo(/*0*/ p0: java.io.Closeable!): kotlin.Unit
         public abstract fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.txt
index 126e113526c..1707daa1394 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.txt
@@ -13,4 +13,4 @@ public trait ArraysInSubtypes {
         public abstract fun listOfArray(): (kotlin.MutableList<out kotlin.Array<(out) kotlin.CharSequence!>!>..kotlin.List<kotlin.Array<(out) kotlin.CharSequence!>!>?)
         public abstract fun objArray(): kotlin.Array<(out) kotlin.Any!>!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.txt
index b3f8fa2a13d..333567df6bf 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.txt
@@ -10,4 +10,4 @@ public trait MethodTypeParameterErased {
         public constructor SubBug()
         public open fun save(): test.MethodTypeParameterErased.SubBug!
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.txt
index cd714062e2b..8f9aaab245c 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.txt
@@ -2,16 +2,16 @@ package test
 
 public open class RawSuperType {
     public constructor RawSuperType()
-    
+
     public open inner class Derived : test.RawSuperType.Super<kotlin.Any?> {
         public constructor Derived()
         public open override /*1*/ fun foo(/*0*/ p0: kotlin.Any!): kotlin.Unit
     }
-    
+
     public trait Super</*0*/ T> {
         public abstract fun foo(/*0*/ p0: T!): kotlin.Unit
     }
-    
+
     // Static members
-    public /*synthesized*/ fun </*0*/ T> Super(/*0*/ function: (T!) -> kotlin.Unit): test.RawSuperType.Super<T>
-}
+    public final /*synthesized*/ fun </*0*/ T> Super(/*0*/ function: (T!) -> kotlin.Unit): test.RawSuperType.Super<T>
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.txt
index 8d3069ac5df..43415a3a1a7 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.txt
@@ -19,4 +19,4 @@ public trait ReturnInnerSubclassOfSupersInner {
             public/*package*/ open fun get(): test.ReturnInnerSubclassOfSupersInner.Super<A!>!
         }
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.txt
index 4a28207de12..5b5f156a232 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.txt
@@ -3,24 +3,24 @@ package test
 public trait SubclassWithRawType {
 
     public trait Sub : test.SubclassWithRawType.Super {
-        public abstract override /*1*/ fun array1(): kotlin.Array<kotlin.List<kotlin.String?>>?
-        public abstract override /*1*/ fun array2(): kotlin.Array<kotlin.List<kotlin.Any>>?
-        public abstract override /*1*/ fun boundWildcard1(): kotlin.MutableList<out kotlin.List<kotlin.String?>?>?
-        public abstract override /*1*/ fun boundWildcard2(): kotlin.MutableList<in kotlin.List<kotlin.Any>?>?
-        public abstract override /*1*/ fun simple1(): kotlin.MutableList<out kotlin.String?>?
-        public abstract override /*1*/ fun simple2(): kotlin.MutableList<out kotlin.List<kotlin.String>?>?
-        public abstract override /*1*/ fun simple3(): kotlin.MutableList<out kotlin.Any>?
-        public abstract override /*1*/ fun wildcard(): kotlin.MutableList<out kotlin.Any?>?
+        public abstract override /*1*/ fun array1(): kotlin.Array<(out) kotlin.(Mutable)List<kotlin.String!>!>!
+        public abstract override /*1*/ fun array2(): kotlin.Array<(out) (kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)>!
+        public abstract override /*1*/ fun boundWildcard1(): (kotlin.MutableList<out kotlin.(Mutable)List<kotlin.String!>!>..kotlin.List<kotlin.(Mutable)List<kotlin.String!>!>?)
+        public abstract override /*1*/ fun boundWildcard2(): kotlin.(Mutable)List<in (kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)>!
+        public abstract override /*1*/ fun simple1(): kotlin.(Mutable)List<kotlin.String!>!
+        public abstract override /*1*/ fun simple2(): kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!
+        public abstract override /*1*/ fun simple3(): (kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)
+        public abstract override /*1*/ fun wildcard(): (kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)
     }
 
     public trait Super {
-        public abstract fun array1(): kotlin.Array<kotlin.List<kotlin.Any?>>?
-        public abstract fun array2(): kotlin.Array<kotlin.List<kotlin.String>>?
-        public abstract fun boundWildcard1(): kotlin.MutableList<out kotlin.List<kotlin.Any?>?>?
-        public abstract fun boundWildcard2(): kotlin.MutableList<in kotlin.List<kotlin.String>?>?
-        public abstract fun simple1(): kotlin.MutableList<out kotlin.Any?>?
-        public abstract fun simple2(): kotlin.MutableList<out kotlin.Any?>?
-        public abstract fun simple3(): kotlin.MutableList<kotlin.String>?
-        public abstract fun wildcard(): kotlin.MutableList<out kotlin.Any?>?
+        public abstract fun array1(): kotlin.Array<(out) (kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)>!
+        public abstract fun array2(): kotlin.Array<(out) kotlin.(Mutable)List<kotlin.String!>!>!
+        public abstract fun boundWildcard1(): (kotlin.MutableList<out (kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)>..kotlin.List<(kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)>?)
+        public abstract fun boundWildcard2(): kotlin.(Mutable)List<in kotlin.(Mutable)List<kotlin.String!>!>!
+        public abstract fun simple1(): (kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)
+        public abstract fun simple2(): (kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)
+        public abstract fun simple3(): kotlin.(Mutable)List<kotlin.String!>!
+        public abstract fun wildcard(): (kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.txt
index 04d405a2191..41d4e3482d5 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.txt
@@ -8,12 +8,12 @@ public trait TwoSuperclassesInconsistentGenericTypes {
     public trait Other {
         public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
-    
+
     public open class Sub : test.TwoSuperclassesInconsistentGenericTypes, test.TwoSuperclassesInconsistentGenericTypes.Other {
         public constructor Sub()
         public open override /*2*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
     }
-    
+
     // Static members
-    public /*synthesized*/ fun Other(/*0*/ function: () -> kotlin.(Mutable)List<kotlin.String!>!): test.TwoSuperclassesInconsistentGenericTypes.Other
-}
+    public final /*synthesized*/ fun Other(/*0*/ function: () -> kotlin.(Mutable)List<kotlin.String!>!): test.TwoSuperclassesInconsistentGenericTypes.Other
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt
index afa30e14b15..bca34642c17 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt
@@ -1,20 +1,20 @@
 package test
 
 public trait TwoSuperclassesVarargAndNot {
-    
+
     public trait Sub : test.TwoSuperclassesVarargAndNot.Super1, test.TwoSuperclassesVarargAndNot.Super2 {
-        public abstract override /*2*/ fun foo(/*0*/ p0: kotlin.Array<(out) kotlin.String!>!): kotlin.Unit
+        public abstract override /*2*/ fun foo(/*0*/ s: kotlin.Array<(out) kotlin.String!>!): kotlin.Unit
     }
-    
+
     public trait Super1 {
         public abstract fun foo(/*0*/ vararg p0: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit
     }
-    
+
     public trait Super2 {
-        public abstract fun foo(/*0*/ p0: kotlin.Array<(out) kotlin.String!>!): kotlin.Unit
+        public abstract fun foo(/*0*/ s: kotlin.Array<(out) kotlin.String!>!): kotlin.Unit
     }
-    
+
     // Static members
-    public /*synthesized*/ fun Super1(/*0*/ function: (kotlin.Array<(out) kotlin.String!>!) -> kotlin.Unit): test.TwoSuperclassesVarargAndNot.Super1
-    public /*synthesized*/ fun Super2(/*0*/ function: (kotlin.Array<(out) kotlin.String!>!) -> kotlin.Unit): test.TwoSuperclassesVarargAndNot.Super2
-}
+    public final /*synthesized*/ fun Super1(/*0*/ function: (kotlin.Array<(out) kotlin.String!>!) -> kotlin.Unit): test.TwoSuperclassesVarargAndNot.Super1
+    public final /*synthesized*/ fun Super2(/*0*/ function: (kotlin.Array<(out) kotlin.String!>!) -> kotlin.Unit): test.TwoSuperclassesVarargAndNot.Super2
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.txt b/compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.txt
index aee1eb7b456..2ec98d3c5e1 100644
--- a/compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.txt
+++ b/compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.txt
@@ -17,4 +17,4 @@ public open class DeeplyInnerClass {
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.txt b/compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.txt
index ff1c72b56b1..2ea15560d32 100644
--- a/compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.txt
+++ b/compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.txt
@@ -2,15 +2,15 @@ package test
 
 public open class DeeplyNestedStatic {
     public constructor DeeplyNestedStatic()
-    
+
     public open class Foo {
         public constructor Foo()
-        
+
         public open class Bar {
             public constructor Bar()
-            
+
             // Static members
             public open fun method(): kotlin.Unit
         }
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/static/Enum.txt b/compiler/testData/loadJava/compiledJava/static/Enum.txt
index 1bd8cbfc3c7..4715931f595 100644
--- a/compiler/testData/loadJava/compiledJava/static/Enum.txt
+++ b/compiler/testData/loadJava/compiledJava/static/Enum.txt
@@ -56,4 +56,4 @@ public final enum class Enum : kotlin.Enum<test.Enum!> {
     // Static members
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Enum
     public final /*synthesized*/ fun values(): kotlin.Array<test.Enum>
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/static/InnerClass.txt b/compiler/testData/loadJava/compiledJava/static/InnerClass.txt
index c90dcfa3c82..07c3e7f6df2 100644
--- a/compiler/testData/loadJava/compiledJava/static/InnerClass.txt
+++ b/compiler/testData/loadJava/compiledJava/static/InnerClass.txt
@@ -12,4 +12,4 @@ public open class InnerClass {
         public constructor Nested()
         public open fun bar(): kotlin.Unit
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/static/Simple.txt b/compiler/testData/loadJava/compiledJava/static/Simple.txt
index a6940f25a2e..0a4fed21dd2 100644
--- a/compiler/testData/loadJava/compiledJava/static/Simple.txt
+++ b/compiler/testData/loadJava/compiledJava/static/Simple.txt
@@ -3,7 +3,7 @@ package test
 public open class Simple {
     public constructor Simple()
     public open fun foo(): kotlin.Unit
-    
+
     // Static members
     public open fun bar(): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/static/StaticFinal.txt b/compiler/testData/loadJava/compiledJava/static/StaticFinal.txt
index 88dee4cb21c..ab7f9361889 100644
--- a/compiler/testData/loadJava/compiledJava/static/StaticFinal.txt
+++ b/compiler/testData/loadJava/compiledJava/static/StaticFinal.txt
@@ -2,7 +2,7 @@ package test
 
 public open class StaticFinal {
     public constructor StaticFinal()
-    
+
     // Static members
     public final val foo: kotlin.String = "aaa"
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt
index 811a30bd9bd..e351a32456b 100644
--- a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt
+++ b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt
@@ -4,25 +4,25 @@ public final enum class StaticMembersInEnum : kotlin.Enum<test.StaticMembersInEn
     private constructor StaticMembersInEnum()
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    
+
     public enum entry ENTRY : test.StaticMembersInEnum {
         private constructor ENTRY()
         public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
         public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        
+
         public class object <class-object-for-ENTRY> : test.StaticMembersInEnum.ENTRY {
             private constructor <class-object-for-ENTRY>()
             public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
             public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
         }
     }
-    
+
     // Static members
-    public val CONSTANT: test.StaticMembersInEnum!
-    public var STATIC_FIELD: kotlin.Int
+    public final val CONSTANT: test.StaticMembersInEnum!
+    public final var STATIC_FIELD: kotlin.Int
     public open fun foo(): kotlin.Unit
     public open fun valueOf(/*0*/ p0: kotlin.Int): kotlin.Unit
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.StaticMembersInEnum
     public final /*synthesized*/ fun values(): kotlin.Array<test.StaticMembersInEnum>
     public open fun values(/*0*/ p0: kotlin.Int): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/vararg/VarargInt.txt b/compiler/testData/loadJava/compiledJava/vararg/VarargInt.txt
index dcb964db97d..4e4c8c1b756 100644
--- a/compiler/testData/loadJava/compiledJava/vararg/VarargInt.txt
+++ b/compiler/testData/loadJava/compiledJava/vararg/VarargInt.txt
@@ -3,4 +3,4 @@ package test
 public open class VarargInt {
     public constructor VarargInt()
     public open fun vararg(/*0*/ vararg p0: kotlin.Int /*kotlin.IntArray!*/): kotlin.Unit
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/loadJava/compiledJava/vararg/VarargString.txt b/compiler/testData/loadJava/compiledJava/vararg/VarargString.txt
index 36414b98d49..5d4094fba60 100644
--- a/compiler/testData/loadJava/compiledJava/vararg/VarargString.txt
+++ b/compiler/testData/loadJava/compiledJava/vararg/VarargString.txt
@@ -3,4 +3,4 @@ package test
 public open class VarargString {
     public constructor VarargString()
     public open fun vararg(/*0*/ vararg p0: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit
-}
+}
\ No newline at end of file