diff --git a/compiler/testData/lazyResolve/diagnostics/BinaryCallsOnNullableValues.txt b/compiler/testData/lazyResolve/diagnostics/BinaryCallsOnNullableValues.txt
index c2ce323156d..106dc25fefc 100644
--- a/compiler/testData/lazyResolve/diagnostics/BinaryCallsOnNullableValues.txt
+++ b/compiler/testData/lazyResolve/diagnostics/BinaryCallsOnNullableValues.txt
@@ -2,11 +2,14 @@ namespace <root>
 
 internal final class A : jet.Any {
     public final /*constructor*/ fun <init>(): A
+    internal final fun equals(/*0*/ a: jet.Any?): jet.Boolean
 }
 internal final class B : jet.Any {
     public final /*constructor*/ fun <init>(): B
+    internal final fun equals(/*0*/ a: jet.Any?): jet.Boolean?
 }
 internal final class C : jet.Any {
     public final /*constructor*/ fun <init>(): C
+    internal final fun equals(/*0*/ a: jet.Any?): jet.Int
 }
 internal final fun f(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/Builders.txt b/compiler/testData/lazyResolve/diagnostics/Builders.txt
index 493b4d40cca..07e7d2f6c33 100644
--- a/compiler/testData/lazyResolve/diagnostics/Builders.txt
+++ b/compiler/testData/lazyResolve/diagnostics/Builders.txt
@@ -17,6 +17,7 @@ internal final class html.A : html.BodyTag {
     internal final override /*1*/ fun p(/*0*/ init: jet.ExtensionFunction0<html.P, jet.Tuple0>): html.P
     internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
     invisible_fake abstract override /*1*/ fun renderAttributes(): jet.String?
+    internal open override /*1*/ fun toString(): jet.String?
     internal final override /*1*/ fun ul(/*0*/ init: jet.ExtensionFunction0<html.UL, jet.Tuple0>): html.UL
 }
 internal final class html.B : html.BodyTag {
@@ -32,6 +33,7 @@ internal final class html.B : html.BodyTag {
     internal final override /*1*/ fun p(/*0*/ init: jet.ExtensionFunction0<html.P, jet.Tuple0>): html.P
     internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
     invisible_fake abstract override /*1*/ fun renderAttributes(): jet.String?
+    internal open override /*1*/ fun toString(): jet.String?
     internal final override /*1*/ fun ul(/*0*/ init: jet.ExtensionFunction0<html.UL, jet.Tuple0>): html.UL
 }
 internal final class html.Body : html.BodyTag {
@@ -47,6 +49,7 @@ internal final class html.Body : html.BodyTag {
     internal final override /*1*/ fun p(/*0*/ init: jet.ExtensionFunction0<html.P, jet.Tuple0>): html.P
     internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
     invisible_fake abstract override /*1*/ fun renderAttributes(): jet.String?
+    internal open override /*1*/ fun toString(): jet.String?
     internal final override /*1*/ fun ul(/*0*/ init: jet.ExtensionFunction0<html.UL, jet.Tuple0>): html.UL
 }
 internal abstract class html.BodyTag : html.TagWithText {
@@ -62,10 +65,12 @@ internal abstract class html.BodyTag : html.TagWithText {
     internal final fun p(/*0*/ init: jet.ExtensionFunction0<html.P, jet.Tuple0>): html.P
     internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
     invisible_fake abstract override /*1*/ fun renderAttributes(): jet.String?
+    internal open override /*1*/ fun toString(): jet.String?
     internal final fun ul(/*0*/ init: jet.ExtensionFunction0<html.UL, jet.Tuple0>): html.UL
 }
 internal abstract trait html.Element : jet.Any {
     internal abstract fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
+    internal open fun toString(): jet.String?
 }
 internal final class html.H1 : html.BodyTag {
     public final /*constructor*/ fun <init>(): html.H1
@@ -80,6 +85,7 @@ internal final class html.H1 : html.BodyTag {
     internal final override /*1*/ fun p(/*0*/ init: jet.ExtensionFunction0<html.P, jet.Tuple0>): html.P
     internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
     invisible_fake abstract override /*1*/ fun renderAttributes(): jet.String?
+    internal open override /*1*/ fun toString(): jet.String?
     internal final override /*1*/ fun ul(/*0*/ init: jet.ExtensionFunction0<html.UL, jet.Tuple0>): html.UL
 }
 internal final class html.HTML : html.TagWithText {
@@ -93,6 +99,7 @@ internal final class html.HTML : html.TagWithText {
     internal final override /*1*/ val name: jet.String
     internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
     invisible_fake abstract override /*1*/ fun renderAttributes(): jet.String?
+    internal open override /*1*/ fun toString(): jet.String?
 }
 internal final class html.Head : html.TagWithText {
     public final /*constructor*/ fun <init>(): html.Head
@@ -104,6 +111,7 @@ internal final class html.Head : html.TagWithText {
     internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
     invisible_fake abstract override /*1*/ fun renderAttributes(): jet.String?
     internal final fun title(/*0*/ init: jet.ExtensionFunction0<html.Title, jet.Tuple0>): html.Title
+    internal open override /*1*/ fun toString(): jet.String?
 }
 internal final class html.LI : html.BodyTag {
     public final /*constructor*/ fun <init>(): html.LI
@@ -118,6 +126,7 @@ internal final class html.LI : html.BodyTag {
     internal final override /*1*/ fun p(/*0*/ init: jet.ExtensionFunction0<html.P, jet.Tuple0>): html.P
     internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
     invisible_fake abstract override /*1*/ fun renderAttributes(): jet.String?
+    internal open override /*1*/ fun toString(): jet.String?
     internal final override /*1*/ fun ul(/*0*/ init: jet.ExtensionFunction0<html.UL, jet.Tuple0>): html.UL
 }
 internal final class html.P : html.BodyTag {
@@ -133,6 +142,7 @@ internal final class html.P : html.BodyTag {
     internal final override /*1*/ fun p(/*0*/ init: jet.ExtensionFunction0<html.P, jet.Tuple0>): html.P
     internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
     invisible_fake abstract override /*1*/ fun renderAttributes(): jet.String?
+    internal open override /*1*/ fun toString(): jet.String?
     internal final override /*1*/ fun ul(/*0*/ init: jet.ExtensionFunction0<html.UL, jet.Tuple0>): html.UL
 }
 internal abstract class html.Tag : html.Element {
@@ -143,6 +153,7 @@ internal abstract class html.Tag : html.Element {
     internal final val name: jet.String
     internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
     private final fun renderAttributes(): jet.String?
+    internal open override /*1*/ fun toString(): jet.String?
 }
 internal abstract class html.TagWithText : html.Tag {
     public final /*constructor*/ fun <init>(/*0*/ name: jet.String): html.TagWithText
@@ -153,11 +164,13 @@ internal abstract class html.TagWithText : html.Tag {
     internal final override /*1*/ val name: jet.String
     internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
     invisible_fake abstract override /*1*/ fun renderAttributes(): jet.String?
+    internal open override /*1*/ fun toString(): jet.String?
 }
 internal final class html.TextElement : html.Element {
     public final /*constructor*/ fun <init>(/*0*/ text: jet.String): html.TextElement
     internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
     internal final val text: jet.String
+    internal open override /*1*/ fun toString(): jet.String?
 }
 internal final class html.Title : html.TagWithText {
     public final /*constructor*/ fun <init>(): html.Title
@@ -168,6 +181,7 @@ internal final class html.Title : html.TagWithText {
     internal final override /*1*/ val name: jet.String
     internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
     invisible_fake abstract override /*1*/ fun renderAttributes(): jet.String?
+    internal open override /*1*/ fun toString(): jet.String?
 }
 internal final class html.UL : html.BodyTag {
     public final /*constructor*/ fun <init>(): html.UL
@@ -183,6 +197,7 @@ internal final class html.UL : html.BodyTag {
     internal final override /*1*/ fun p(/*0*/ init: jet.ExtensionFunction0<html.P, jet.Tuple0>): html.P
     internal open override /*1*/ fun render(/*0*/ builder: java.lang.StringBuilder, /*1*/ indent: jet.String): jet.Tuple0
     invisible_fake abstract override /*1*/ fun renderAttributes(): jet.String?
+    internal open override /*1*/ fun toString(): jet.String?
     internal final override /*1*/ fun ul(/*0*/ init: jet.ExtensionFunction0<html.UL, jet.Tuple0>): html.UL
 }
 internal final fun html(/*0*/ init: jet.ExtensionFunction0<html.HTML, jet.Tuple0>): html.HTML
diff --git a/compiler/testData/lazyResolve/diagnostics/ValAndFunOverrideCompatibilityClash.txt b/compiler/testData/lazyResolve/diagnostics/ValAndFunOverrideCompatibilityClash.txt
index fee77e33334..b38bcf2e83f 100644
--- a/compiler/testData/lazyResolve/diagnostics/ValAndFunOverrideCompatibilityClash.txt
+++ b/compiler/testData/lazyResolve/diagnostics/ValAndFunOverrideCompatibilityClash.txt
@@ -17,10 +17,15 @@ internal final class Foo1 : java.util.ArrayList<jet.Int> {
     public open override /*1*/ fun addAll(/*0*/ p0: java.util.Collection<out jet.Int>): jet.Boolean
     public open override /*1*/ fun addAll(/*0*/ p0: jet.Int, /*1*/ p1: java.util.Collection<out jet.Int>): jet.Boolean
     public open override /*1*/ fun clear(): jet.Tuple0
+    public open override /*1*/ fun clone(): jet.Any
     public open override /*1*/ fun contains(/*0*/ p0: jet.Any?): jet.Boolean
     public open override /*1*/ fun containsAll(/*0*/ p0: java.util.Collection<out jet.Any?>): jet.Boolean
     public open override /*1*/ fun ensureCapacity(/*0*/ p0: jet.Int): jet.Tuple0
+    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
+    protected open override /*1*/ fun finalize(): jet.Tuple0
     public open override /*1*/ fun get(/*0*/ p0: jet.Int): jet.Int
+    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
+    public open override /*1*/ fun hashCode(): jet.Int
     public open override /*1*/ fun indexOf(/*0*/ p0: jet.Any?): jet.Int
     public open override /*1*/ fun isEmpty(): jet.Boolean
     public open override /*1*/ fun iterator(): java.util.Iterator<jet.Int>
@@ -28,6 +33,8 @@ internal final class Foo1 : java.util.ArrayList<jet.Int> {
     public open override /*1*/ fun listIterator(): java.util.ListIterator<jet.Int>
     public open override /*1*/ fun listIterator(/*0*/ p0: jet.Int): java.util.ListIterator<jet.Int>
     protected final override /*1*/ var modCount: jet.Int
+    public final override /*1*/ fun notify(): jet.Tuple0
+    public final override /*1*/ fun notifyAll(): jet.Tuple0
     public open override /*1*/ fun remove(/*0*/ p0: jet.Any?): jet.Boolean
     public open override /*1*/ fun remove(/*0*/ p0: jet.Int): jet.Int
     public open override /*1*/ fun removeAll(/*0*/ p0: java.util.Collection<out jet.Any?>): jet.Boolean
@@ -38,5 +45,9 @@ internal final class Foo1 : java.util.ArrayList<jet.Int> {
     public open override /*1*/ fun subList(/*0*/ p0: jet.Int, /*1*/ p1: jet.Int): java.util.List<jet.Int>
     public open override /*1*/ fun toArray(): jet.Array<jet.Any?>
     public open override /*1*/ fun </*0*/ T : jet.Any?>toArray(/*0*/ p0: jet.Array<T>): jet.Array<T>
+    public open override /*1*/ fun toString(): jet.String?
     public open override /*1*/ fun trimToSize(): jet.Tuple0
+    public final override /*1*/ fun wait(): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
 }
diff --git a/compiler/testData/lazyResolve/diagnostics/inference/kt619.txt b/compiler/testData/lazyResolve/diagnostics/inference/kt619.txt
new file mode 100644
index 00000000000..0c886274c8f
--- /dev/null
+++ b/compiler/testData/lazyResolve/diagnostics/inference/kt619.txt
@@ -0,0 +1,7 @@
+namespace <root>
+
+internal final class A : jet.Comparable<A> {
+    public final /*constructor*/ fun <init>(/*0*/ t: jet.Int): A
+    public open override /*1*/ fun compareTo(/*0*/ other: A): jet.Int
+    internal final var i: jet.Int
+}
diff --git a/compiler/testData/lazyResolve/diagnostics/j+k/OverrideVararg.txt b/compiler/testData/lazyResolve/diagnostics/j+k/OverrideVararg.txt
index 189d3c78ead..312b83028b0 100644
--- a/compiler/testData/lazyResolve/diagnostics/j+k/OverrideVararg.txt
+++ b/compiler/testData/lazyResolve/diagnostics/j+k/OverrideVararg.txt
@@ -2,9 +2,31 @@ namespace <root>
 
 public abstract class Aaa : java.lang.Object {
     public final /*constructor*/ fun <init>(): Aaa
+    protected open override /*1*/ fun clone(): jet.Any
+    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
+    protected open override /*1*/ fun finalize(): jet.Tuple0
     public abstract fun foo(/*0*/ vararg args: jet.String? /*jet.Array<jet.String?>*/): jet.Tuple0
+    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
+    public open override /*1*/ fun hashCode(): jet.Int
+    public final override /*1*/ fun notify(): jet.Tuple0
+    public final override /*1*/ fun notifyAll(): jet.Tuple0
+    public open override /*1*/ fun toString(): jet.String?
+    public final override /*1*/ fun wait(): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
 }
 internal final class Bbb : Aaa {
     public final /*constructor*/ fun <init>(): Bbb
+    protected open override /*1*/ fun clone(): jet.Any
+    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
+    protected open override /*1*/ fun finalize(): jet.Tuple0
     public open override /*1*/ fun foo(/*0*/ vararg args: jet.String? /*jet.Array<jet.String?>*/): jet.Tuple0
+    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
+    public open override /*1*/ fun hashCode(): jet.Int
+    public final override /*1*/ fun notify(): jet.Tuple0
+    public final override /*1*/ fun notifyAll(): jet.Tuple0
+    public open override /*1*/ fun toString(): jet.String?
+    public final override /*1*/ fun wait(): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
 }
diff --git a/compiler/testData/lazyResolve/diagnostics/j+k/Simple.txt b/compiler/testData/lazyResolve/diagnostics/j+k/Simple.txt
new file mode 100644
index 00000000000..758c1a2fb3d
--- /dev/null
+++ b/compiler/testData/lazyResolve/diagnostics/j+k/Simple.txt
@@ -0,0 +1,3 @@
+namespace <root>
+
+internal final fun foo(/*0*/ a: aa.A): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/j+k/StaticMembersFromSuperclasses.txt b/compiler/testData/lazyResolve/diagnostics/j+k/StaticMembersFromSuperclasses.txt
index 57726bf42fc..9631d7df31a 100644
--- a/compiler/testData/lazyResolve/diagnostics/j+k/StaticMembersFromSuperclasses.txt
+++ b/compiler/testData/lazyResolve/diagnostics/j+k/StaticMembersFromSuperclasses.txt
@@ -2,8 +2,30 @@ namespace <root>
 
 public open class Aaa : java.lang.Object {
     public final /*constructor*/ fun <init>(): Aaa
+    protected open override /*1*/ fun clone(): jet.Any
+    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
+    protected open override /*1*/ fun finalize(): jet.Tuple0
+    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
+    public open override /*1*/ fun hashCode(): jet.Int
+    public final override /*1*/ fun notify(): jet.Tuple0
+    public final override /*1*/ fun notifyAll(): jet.Tuple0
+    public open override /*1*/ fun toString(): jet.String?
+    public final override /*1*/ fun wait(): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
 }
 public open class Bbb : Aaa {
     public final /*constructor*/ fun <init>(): Bbb
+    protected open override /*1*/ fun clone(): jet.Any
+    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
+    protected open override /*1*/ fun finalize(): jet.Tuple0
+    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
+    public open override /*1*/ fun hashCode(): jet.Int
+    public final override /*1*/ fun notify(): jet.Tuple0
+    public final override /*1*/ fun notifyAll(): jet.Tuple0
+    public open override /*1*/ fun toString(): jet.String?
+    public final override /*1*/ fun wait(): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
 }
 internal final fun foo(): jet.String
diff --git a/compiler/testData/lazyResolve/diagnostics/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.txt b/compiler/testData/lazyResolve/diagnostics/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.txt
index e6e67c4233e..f439ed7f3dc 100644
--- a/compiler/testData/lazyResolve/diagnostics/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.txt
+++ b/compiler/testData/lazyResolve/diagnostics/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.txt
@@ -2,15 +2,48 @@ namespace <root>
 
 public open class A : java.lang.Object {
     public final /*constructor*/ fun <init>(): A
+    protected open override /*1*/ fun clone(): jet.Any
+    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
+    protected open override /*1*/ fun finalize(): jet.Tuple0
+    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
+    public open override /*1*/ fun hashCode(): jet.Int
+    public final override /*1*/ fun notify(): jet.Tuple0
+    public final override /*1*/ fun notifyAll(): jet.Tuple0
+    public open override /*1*/ fun toString(): jet.String?
+    public final override /*1*/ fun wait(): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
 }
 public open class X</*0*/ T : jet.Any?> : java.lang.Object {
     public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): X<T>
     package open fun barN(/*0*/ a: T): jet.Tuple0
+    protected open override /*1*/ fun clone(): jet.Any
+    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
+    protected open override /*1*/ fun finalize(): jet.Tuple0
     package open fun fooN(): T
+    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
+    public open override /*1*/ fun hashCode(): jet.Int
+    public final override /*1*/ fun notify(): jet.Tuple0
+    public final override /*1*/ fun notifyAll(): jet.Tuple0
+    public open override /*1*/ fun toString(): jet.String?
+    public final override /*1*/ fun wait(): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
 }
 public open class Y : X<jet.String> {
     public final /*constructor*/ fun <init>(): Y
     package open override /*1*/ fun barN(/*0*/ a: jet.String): jet.Tuple0
+    protected open override /*1*/ fun clone(): jet.Any
+    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
+    protected open override /*1*/ fun finalize(): jet.Tuple0
     package open override /*1*/ fun fooN(): jet.String
+    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
+    public open override /*1*/ fun hashCode(): jet.Int
+    public final override /*1*/ fun notify(): jet.Tuple0
+    public final override /*1*/ fun notifyAll(): jet.Tuple0
+    public open override /*1*/ fun toString(): jet.String?
+    public final override /*1*/ fun wait(): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
 }
 internal final fun main(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.txt b/compiler/testData/lazyResolve/diagnostics/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.txt
index 22612bdce84..2c3b85726ca 100644
--- a/compiler/testData/lazyResolve/diagnostics/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.txt
+++ b/compiler/testData/lazyResolve/diagnostics/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.txt
@@ -2,15 +2,48 @@ namespace <root>
 
 public open class A : java.lang.Object {
     public final /*constructor*/ fun <init>(): A
+    protected open override /*1*/ fun clone(): jet.Any
+    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
+    protected open override /*1*/ fun finalize(): jet.Tuple0
+    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
+    public open override /*1*/ fun hashCode(): jet.Int
+    public final override /*1*/ fun notify(): jet.Tuple0
+    public final override /*1*/ fun notifyAll(): jet.Tuple0
+    public open override /*1*/ fun toString(): jet.String?
+    public final override /*1*/ fun wait(): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
 }
 public open class X</*0*/ T : jet.Any?> : java.lang.Object {
     public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): X<T>
     package open fun barN(/*0*/ a: T): jet.Tuple0
+    protected open override /*1*/ fun clone(): jet.Any
+    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
+    protected open override /*1*/ fun finalize(): jet.Tuple0
     package open fun fooN(): T
+    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
+    public open override /*1*/ fun hashCode(): jet.Int
+    public final override /*1*/ fun notify(): jet.Tuple0
+    public final override /*1*/ fun notifyAll(): jet.Tuple0
+    public open override /*1*/ fun toString(): jet.String?
+    public final override /*1*/ fun wait(): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
 }
 public open class Y : X<A> {
     public final /*constructor*/ fun <init>(): Y
     package open override /*1*/ fun barN(/*0*/ a: A): jet.Tuple0
+    protected open override /*1*/ fun clone(): jet.Any
+    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
+    protected open override /*1*/ fun finalize(): jet.Tuple0
     package open override /*1*/ fun fooN(): A
+    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
+    public open override /*1*/ fun hashCode(): jet.Int
+    public final override /*1*/ fun notify(): jet.Tuple0
+    public final override /*1*/ fun notifyAll(): jet.Tuple0
+    public open override /*1*/ fun toString(): jet.String?
+    public final override /*1*/ fun wait(): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
 }
 internal final fun main(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/j+k/SupertypeArgumentsNullability-SpecialTypes.txt b/compiler/testData/lazyResolve/diagnostics/j+k/SupertypeArgumentsNullability-SpecialTypes.txt
index 06d09f0466b..686fb31841a 100644
--- a/compiler/testData/lazyResolve/diagnostics/j+k/SupertypeArgumentsNullability-SpecialTypes.txt
+++ b/compiler/testData/lazyResolve/diagnostics/j+k/SupertypeArgumentsNullability-SpecialTypes.txt
@@ -2,15 +2,48 @@ namespace <root>
 
 public open class A : java.lang.Object {
     public final /*constructor*/ fun <init>(): A
+    protected open override /*1*/ fun clone(): jet.Any
+    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
+    protected open override /*1*/ fun finalize(): jet.Tuple0
+    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
+    public open override /*1*/ fun hashCode(): jet.Int
+    public final override /*1*/ fun notify(): jet.Tuple0
+    public final override /*1*/ fun notifyAll(): jet.Tuple0
+    public open override /*1*/ fun toString(): jet.String?
+    public final override /*1*/ fun wait(): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
 }
 public open class X</*0*/ T : jet.Any?> : java.lang.Object {
     public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): X<T>
     package open fun bar(/*0*/ a: T?): jet.Tuple0
+    protected open override /*1*/ fun clone(): jet.Any
+    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
+    protected open override /*1*/ fun finalize(): jet.Tuple0
     package open fun foo(): T?
+    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
+    public open override /*1*/ fun hashCode(): jet.Int
+    public final override /*1*/ fun notify(): jet.Tuple0
+    public final override /*1*/ fun notifyAll(): jet.Tuple0
+    public open override /*1*/ fun toString(): jet.String?
+    public final override /*1*/ fun wait(): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
 }
 public open class Y : X<jet.String> {
     public final /*constructor*/ fun <init>(): Y
     package open override /*1*/ fun bar(/*0*/ a: jet.String?): jet.Tuple0
+    protected open override /*1*/ fun clone(): jet.Any
+    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
+    protected open override /*1*/ fun finalize(): jet.Tuple0
     package open override /*1*/ fun foo(): jet.String?
+    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
+    public open override /*1*/ fun hashCode(): jet.Int
+    public final override /*1*/ fun notify(): jet.Tuple0
+    public final override /*1*/ fun notifyAll(): jet.Tuple0
+    public open override /*1*/ fun toString(): jet.String?
+    public final override /*1*/ fun wait(): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
 }
 internal final fun main(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/j+k/SupertypeArgumentsNullability-UserTypes.txt b/compiler/testData/lazyResolve/diagnostics/j+k/SupertypeArgumentsNullability-UserTypes.txt
index c0645c7f222..32ebabf1d90 100644
--- a/compiler/testData/lazyResolve/diagnostics/j+k/SupertypeArgumentsNullability-UserTypes.txt
+++ b/compiler/testData/lazyResolve/diagnostics/j+k/SupertypeArgumentsNullability-UserTypes.txt
@@ -2,15 +2,48 @@ namespace <root>
 
 public open class A : java.lang.Object {
     public final /*constructor*/ fun <init>(): A
+    protected open override /*1*/ fun clone(): jet.Any
+    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
+    protected open override /*1*/ fun finalize(): jet.Tuple0
+    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
+    public open override /*1*/ fun hashCode(): jet.Int
+    public final override /*1*/ fun notify(): jet.Tuple0
+    public final override /*1*/ fun notifyAll(): jet.Tuple0
+    public open override /*1*/ fun toString(): jet.String?
+    public final override /*1*/ fun wait(): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
 }
 public open class X</*0*/ T : jet.Any?> : java.lang.Object {
     public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): X<T>
     package open fun bar(/*0*/ a: T?): jet.Tuple0
+    protected open override /*1*/ fun clone(): jet.Any
+    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
+    protected open override /*1*/ fun finalize(): jet.Tuple0
     package open fun foo(): T?
+    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
+    public open override /*1*/ fun hashCode(): jet.Int
+    public final override /*1*/ fun notify(): jet.Tuple0
+    public final override /*1*/ fun notifyAll(): jet.Tuple0
+    public open override /*1*/ fun toString(): jet.String?
+    public final override /*1*/ fun wait(): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
 }
 public open class Y : X<A> {
     public final /*constructor*/ fun <init>(): Y
     package open override /*1*/ fun bar(/*0*/ a: A?): jet.Tuple0
+    protected open override /*1*/ fun clone(): jet.Any
+    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
+    protected open override /*1*/ fun finalize(): jet.Tuple0
     package open override /*1*/ fun foo(): A?
+    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
+    public open override /*1*/ fun hashCode(): jet.Int
+    public final override /*1*/ fun notify(): jet.Tuple0
+    public final override /*1*/ fun notifyAll(): jet.Tuple0
+    public open override /*1*/ fun toString(): jet.String?
+    public final override /*1*/ fun wait(): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
 }
 internal final fun main(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/j+k/UnboxingNulls.txt b/compiler/testData/lazyResolve/diagnostics/j+k/UnboxingNulls.txt
new file mode 100644
index 00000000000..9669497788a
--- /dev/null
+++ b/compiler/testData/lazyResolve/diagnostics/j+k/UnboxingNulls.txt
@@ -0,0 +1,22 @@
+namespace <root>
+
+// <namespace name="a">
+namespace a
+
+public open class a.Test</*0*/ T : jet.Any?> : java.lang.Object {
+    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): a.Test<T>
+    protected open override /*1*/ fun clone(): jet.Any
+    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
+    protected open override /*1*/ fun finalize(): jet.Tuple0
+    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
+    public open override /*1*/ fun hashCode(): jet.Int
+    public final override /*1*/ fun notify(): jet.Tuple0
+    public final override /*1*/ fun notifyAll(): jet.Tuple0
+    package open fun t(): T?
+    public open override /*1*/ fun toString(): jet.String?
+    public final override /*1*/ fun wait(): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
+}
+internal final fun foo(): jet.Tuple0
+// </namespace name="a">
diff --git a/compiler/testData/lazyResolve/diagnostics/j+k/kt1402.txt b/compiler/testData/lazyResolve/diagnostics/j+k/kt1402.txt
new file mode 100644
index 00000000000..615312d56ef
--- /dev/null
+++ b/compiler/testData/lazyResolve/diagnostics/j+k/kt1402.txt
@@ -0,0 +1,8 @@
+namespace <root>
+
+// <namespace name="b">
+namespace b
+
+internal final fun doSmth(/*0*/ b: a.M.Inner): a.M.Inner
+internal final fun foo(): jet.Tuple0
+// </namespace name="b">
diff --git a/compiler/testData/lazyResolve/diagnostics/j+k/packageVisibility.txt b/compiler/testData/lazyResolve/diagnostics/j+k/packageVisibility.txt
new file mode 100644
index 00000000000..6d3f989d476
--- /dev/null
+++ b/compiler/testData/lazyResolve/diagnostics/j+k/packageVisibility.txt
@@ -0,0 +1,17 @@
+namespace <root>
+
+// <namespace name="a">
+namespace a
+
+// <namespace name="c">
+namespace c
+
+internal final val mc1: a.MyJavaClass
+// </namespace name="c">
+internal final val mc: a.MyJavaClass
+// </namespace name="a">
+// <namespace name="b">
+namespace b
+
+internal final val mc1: a.MyJavaClass
+// </namespace name="b">
diff --git a/compiler/testData/lazyResolve/diagnostics/kt310.txt b/compiler/testData/lazyResolve/diagnostics/kt310.txt
new file mode 100644
index 00000000000..14f0e7383b7
--- /dev/null
+++ b/compiler/testData/lazyResolve/diagnostics/kt310.txt
@@ -0,0 +1,3 @@
+namespace <root>
+
+internal final fun f(/*0*/ c: jet.Array<jet.Int>): jet.Int
diff --git a/compiler/testData/lazyResolve/diagnostics/kt53.txt b/compiler/testData/lazyResolve/diagnostics/kt53.txt
new file mode 100644
index 00000000000..3e08087a9cc
--- /dev/null
+++ b/compiler/testData/lazyResolve/diagnostics/kt53.txt
@@ -0,0 +1,4 @@
+namespace <root>
+
+internal final val  </*0*/ T : jet.Any?, /*1*/ E : jet.Any?> T.foo: E?
+internal final fun test(): jet.Int?
diff --git a/compiler/testData/lazyResolve/diagnostics/override/ComplexValRedeclaration.txt b/compiler/testData/lazyResolve/diagnostics/override/ComplexValRedeclaration.txt
index 0472c8a3f8c..9d85d81f1f1 100644
--- a/compiler/testData/lazyResolve/diagnostics/override/ComplexValRedeclaration.txt
+++ b/compiler/testData/lazyResolve/diagnostics/override/ComplexValRedeclaration.txt
@@ -13,7 +13,6 @@ internal abstract class override.generics.MyAbstractClass</*0*/ T : jet.Any?> :
 internal abstract class override.generics.MyLegalAbstractClass2</*0*/ T : jet.Any?> : override.generics.MyAbstractClass<jet.Int> {
     public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(/*0*/ t: T): override.generics.MyLegalAbstractClass2<T>
     internal final val  </*0*/ R : jet.Any?> pr: T
-    internal abstract override /*1*/ val pr: jet.Int
 }
 // </namespace name="generics">
 // </namespace name="override">
diff --git a/compiler/testData/lazyResolve/diagnostics/override/ConflictingFunctionSignatureFromSuperclass.txt b/compiler/testData/lazyResolve/diagnostics/override/ConflictingFunctionSignatureFromSuperclass.txt
index 08ea7cab9d6..4fa6fdc2a88 100644
--- a/compiler/testData/lazyResolve/diagnostics/override/ConflictingFunctionSignatureFromSuperclass.txt
+++ b/compiler/testData/lazyResolve/diagnostics/override/ConflictingFunctionSignatureFromSuperclass.txt
@@ -7,5 +7,4 @@ internal open class Aaa : jet.Any {
 internal open class Bbb : Aaa {
     public final /*constructor*/ fun <init>(): Bbb
     internal final fun </*0*/ T : jet.Any?>foo(): jet.Int
-    internal final override /*1*/ fun foo(): jet.Int
 }
diff --git a/compiler/testData/lazyResolve/diagnostics/override/ConflictingPropertySignatureFromSuperclass.txt b/compiler/testData/lazyResolve/diagnostics/override/ConflictingPropertySignatureFromSuperclass.txt
index d7f55dd3917..3b8a5b04238 100644
--- a/compiler/testData/lazyResolve/diagnostics/override/ConflictingPropertySignatureFromSuperclass.txt
+++ b/compiler/testData/lazyResolve/diagnostics/override/ConflictingPropertySignatureFromSuperclass.txt
@@ -6,6 +6,5 @@ internal open class Aaa : jet.Any {
 }
 internal open class Bbb : Aaa {
     public final /*constructor*/ fun <init>(): Bbb
-    internal final override /*1*/ val bar: jet.Int
     internal final val  </*0*/ T : jet.Any?> bar: jet.String
 }
diff --git a/compiler/testData/lazyResolve/diagnostics/override/Generics.txt b/compiler/testData/lazyResolve/diagnostics/override/Generics.txt
index 244bcf1a9ec..0f77c6c13f6 100644
--- a/compiler/testData/lazyResolve/diagnostics/override/Generics.txt
+++ b/compiler/testData/lazyResolve/diagnostics/override/Generics.txt
@@ -64,7 +64,6 @@ internal final class override.generics.MyIllegalClass2</*0*/ T : jet.Any?> : ove
     internal final fun foo(/*0*/ t: T): T
     internal abstract override /*1*/ fun foo(/*0*/ t: jet.Int): jet.Int
     internal final val  </*0*/ R : jet.Any?> pr: T
-    internal abstract override /*1*/ val pr: jet.Int
 }
 internal final class override.generics.MyIllegalGenericClass1</*0*/ T : jet.Any?> : override.generics.MyTrait<T>, override.generics.MyAbstractClass<T> {
     public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): override.generics.MyIllegalGenericClass1<T>
@@ -77,7 +76,6 @@ internal final class override.generics.MyIllegalGenericClass2</*0*/ T : jet.Any?
     internal abstract override /*1*/ fun bar(/*0*/ t: R): R
     internal open fun foo(/*0*/ r: R): R
     internal abstract override /*1*/ fun foo(/*0*/ t: T): T
-    internal abstract override /*1*/ val pr: R
     internal open val  </*0*/ T : jet.Any?> pr: R
 }
 internal abstract class override.generics.MyLegalAbstractClass1 : override.generics.MyTrait<jet.Int>, override.generics.MyAbstractClass<jet.String> {
@@ -93,7 +91,6 @@ internal abstract class override.generics.MyLegalAbstractClass2</*0*/ T : jet.An
     internal final fun foo(/*0*/ t: T): T
     internal abstract override /*1*/ fun foo(/*0*/ t: jet.Int): jet.Int
     internal final val  </*0*/ R : jet.Any?> pr: T
-    internal abstract override /*1*/ val pr: jet.Int
 }
 internal abstract trait override.generics.MyProps</*0*/ T : jet.Any?> : jet.Any {
     internal abstract val p: T
diff --git a/compiler/testData/lazyResolve/diagnostics/override/InvisiblePotentialOverride.txt b/compiler/testData/lazyResolve/diagnostics/override/InvisiblePotentialOverride.txt
index 2096b4bc0b3..396fde450f0 100644
--- a/compiler/testData/lazyResolve/diagnostics/override/InvisiblePotentialOverride.txt
+++ b/compiler/testData/lazyResolve/diagnostics/override/InvisiblePotentialOverride.txt
@@ -6,6 +6,5 @@ internal open class A : jet.Any {
 }
 internal final class B : A {
     public final /*constructor*/ fun <init>(): B
-    invisible_fake final override /*1*/ fun foo(): jet.Int
     internal final fun foo(): jet.String
 }
diff --git a/compiler/testData/lazyResolve/diagnostics/redeclarations/ConflictingExtensionProperties.txt b/compiler/testData/lazyResolve/diagnostics/redeclarations/ConflictingExtensionProperties.txt
new file mode 100644
index 00000000000..7202aa366a3
--- /dev/null
+++ b/compiler/testData/lazyResolve/diagnostics/redeclarations/ConflictingExtensionProperties.txt
@@ -0,0 +1,8 @@
+namespace <root>
+
+// <namespace name="foo">
+namespace foo
+
+internal final val jet.Int.foo: jet.Int
+internal final val jet.Int.foo: jet.Int
+// </namespace name="foo">
diff --git a/compiler/testData/lazyResolve/diagnostics/redeclarations/PropertyAndFunInClass.txt b/compiler/testData/lazyResolve/diagnostics/redeclarations/PropertyAndFunInClass.txt
new file mode 100644
index 00000000000..d5706d667ef
--- /dev/null
+++ b/compiler/testData/lazyResolve/diagnostics/redeclarations/PropertyAndFunInClass.txt
@@ -0,0 +1,12 @@
+namespace <root>
+
+internal final class A : jet.Any {
+    public final /*constructor*/ fun <init>(): A
+    internal final fun a(): jet.Int
+    internal final val a: jet.Int
+}
+internal final class B : jet.Any {
+    public final /*constructor*/ fun <init>(): B
+    internal final fun b(): jet.Int
+    internal final val b: jet.Int
+}
diff --git a/compiler/testData/lazyResolve/diagnostics/redeclarations/kt470.txt b/compiler/testData/lazyResolve/diagnostics/redeclarations/kt470.txt
new file mode 100644
index 00000000000..7617e47dc93
--- /dev/null
+++ b/compiler/testData/lazyResolve/diagnostics/redeclarations/kt470.txt
@@ -0,0 +1,33 @@
+namespace <root>
+
+internal final class A : jet.Any {
+    public final /*constructor*/ fun <init>(): A
+    internal final val a: jet.Int
+    internal final val a: jet.Int
+    internal final val a: jet.Int
+    internal final val b: jet.Int
+    internal final val b: jet.Int
+    internal final val b: jet.Int
+    internal final val b: jet.Int
+    internal final fun bar(): jet.Tuple0
+    internal final fun bar(): jet.Tuple0
+    internal final fun bar(): jet.Tuple0
+    internal final fun foo(): jet.Tuple0
+    internal final fun foo(): jet.Tuple0
+    internal final fun foo(): jet.Tuple0
+    internal final fun foo(): jet.Tuple0
+}
+internal final val a: jet.Int
+internal final val a: jet.Int
+internal final val a: jet.Int
+internal final val b: jet.Int
+internal final val b: jet.Int
+internal final val b: jet.Int
+internal final val b: jet.Int
+internal final fun bar(): jet.Tuple0
+internal final fun bar(): jet.Tuple0
+internal final fun bar(): jet.Tuple0
+internal final fun foo(): jet.Tuple0
+internal final fun foo(): jet.Tuple0
+internal final fun foo(): jet.Tuple0
+internal final fun foo(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt2376.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt2376.txt
index d1101ee4131..1a03ee863d5 100644
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt2376.txt
+++ b/compiler/testData/lazyResolve/diagnostics/regressions/kt2376.txt
@@ -2,6 +2,17 @@ namespace <root>
 
 public open class Test : java.lang.Object {
     public final /*constructor*/ fun <init>(): Test
+    protected open override /*1*/ fun clone(): jet.Any
+    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
+    protected open override /*1*/ fun finalize(): jet.Tuple0
+    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
+    public open override /*1*/ fun hashCode(): jet.Int
+    public final override /*1*/ fun notify(): jet.Tuple0
+    public final override /*1*/ fun notifyAll(): jet.Tuple0
     package open fun number(/*0*/ n: jet.Number?): jet.Tuple0
+    public open override /*1*/ fun toString(): jet.String?
+    public final override /*1*/ fun wait(): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
 }
 internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt335.336.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt335.336.txt
index da8169f6c27..b0b9b6526ec 100644
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt335.336.txt
+++ b/compiler/testData/lazyResolve/diagnostics/regressions/kt335.336.txt
@@ -1,4 +1,4 @@
 namespace <root>
 
 internal final fun </*0*/ T : jet.Any?>java.util.List<T>.plus(/*0*/ other: java.util.List<T>): java.util.List<T>
-internal final fun </*0*/ T : java.lang.Comparable<T>>java.util.List<T>.sort(): jet.Tuple0
+internal final fun </*0*/ T : jet.Comparable<T>>java.util.List<T>.sort(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/regressions/kt588.txt b/compiler/testData/lazyResolve/diagnostics/regressions/kt588.txt
index ccef9682802..5a55484f8e6 100644
--- a/compiler/testData/lazyResolve/diagnostics/regressions/kt588.txt
+++ b/compiler/testData/lazyResolve/diagnostics/regressions/kt588.txt
@@ -3,15 +3,20 @@ namespace <root>
 internal final class Test : java.lang.Thread {
     public final /*constructor*/ fun <init>(): Test
     public final override /*1*/ fun checkAccess(): jet.Tuple0
+    protected open override /*1*/ fun clone(): jet.Any
     public open override /*1*/ fun countStackFrames(): jet.Int
     public open override /*1*/ fun destroy(): jet.Tuple0
+    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
+    protected open override /*1*/ fun finalize(): jet.Tuple0
+    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
     public open override /*1*/ fun getContextClassLoader(): java.lang.ClassLoader?
     public open override /*1*/ fun getId(): jet.Long
     public final override /*1*/ fun getName(): jet.String?
     public final override /*1*/ fun getPriority(): jet.Int
     public open override /*1*/ fun getStackTrace(): jet.Array<[ERROR : Unresolved java class: StackTraceElement]>?
     public final override /*1*/ fun getThreadGroup(): [ERROR : Unresolved java class: ThreadGroup]
-    invisible_fake final override /*1*/ var inheritableThreadLocals: java.lang.ThreadLocal.ThreadLocalMap?
+    public open override /*1*/ fun hashCode(): jet.Int
+    invisible_fake abstract override /*1*/ var inheritableThreadLocals: java.lang.ThreadLocal.ThreadLocalMap?
     public open override /*1*/ fun interrupt(): jet.Tuple0
     public final override /*1*/ fun isAlive(): jet.Boolean
     public final override /*1*/ fun isDaemon(): jet.Boolean
@@ -19,6 +24,8 @@ internal final class Test : java.lang.Thread {
     public final override /*1*/ fun join(): jet.Tuple0
     public final override /*1*/ fun join(/*0*/ p0: jet.Long): jet.Tuple0
     public final override /*1*/ fun join(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
+    public final override /*1*/ fun notify(): jet.Tuple0
+    public final override /*1*/ fun notifyAll(): jet.Tuple0
     public final override /*1*/ fun resume(): jet.Tuple0
     public open override /*1*/ fun run(): jet.Tuple0
     public open override /*1*/ fun setContextClassLoader(/*0*/ p0: java.lang.ClassLoader?): jet.Tuple0
@@ -29,7 +36,11 @@ internal final class Test : java.lang.Thread {
     public final override /*1*/ fun stop(): jet.Tuple0
     public final override /*1*/ fun stop(/*0*/ p0: jet.Throwable?): jet.Tuple0
     public final override /*1*/ fun suspend(): jet.Tuple0
-    invisible_fake final override /*1*/ var threadLocals: java.lang.ThreadLocal.ThreadLocalMap?
+    invisible_fake abstract override /*1*/ var threadLocals: java.lang.ThreadLocal.ThreadLocalMap?
+    public open override /*1*/ fun toString(): jet.String?
+    public final override /*1*/ fun wait(): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
     internal final class object Test.<no name provided> : jet.Any {
         internal final /*constructor*/ fun <init>(): Test.<no name provided>
         internal final fun init2(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/VisibilityInheritModifier.txt b/compiler/testData/lazyResolve/diagnostics/scopes/VisibilityInheritModifier.txt
index 46681e58e39..d9bbb298bd0 100644
--- a/compiler/testData/lazyResolve/diagnostics/scopes/VisibilityInheritModifier.txt
+++ b/compiler/testData/lazyResolve/diagnostics/scopes/VisibilityInheritModifier.txt
@@ -21,7 +21,6 @@ internal open class b.D : jet.Any {
 }
 internal final class b.E : b.D {
     public final /*constructor*/ fun <init>(): b.E
-    invisible_fake open override /*1*/ fun self(): b.D
     internal open fun self(): b.E
     internal final fun test(): jet.Tuple0
 }
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt1805.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt1805.txt
index 1d2552ad448..9d2471536b6 100644
--- a/compiler/testData/lazyResolve/diagnostics/scopes/kt1805.txt
+++ b/compiler/testData/lazyResolve/diagnostics/scopes/kt1805.txt
@@ -9,7 +9,7 @@ internal open class kt1805.Some : jet.Any {
 }
 internal final class kt1805.SomeSubclass : kt1805.Some {
     public final /*constructor*/ fun <init>(): kt1805.SomeSubclass
-    invisible_fake final override /*1*/ val privateField: jet.Int private get
+    invisible_fake abstract override /*1*/ val privateField: jet.Int private get
     internal final fun test(): jet.Tuple0
 }
 internal final fun test(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/kt1942.txt b/compiler/testData/lazyResolve/diagnostics/scopes/kt1942.txt
new file mode 100644
index 00000000000..b617c8ea043
--- /dev/null
+++ b/compiler/testData/lazyResolve/diagnostics/scopes/kt1942.txt
@@ -0,0 +1,22 @@
+namespace <root>
+
+// <namespace name="d">
+namespace d
+
+internal final class d.A : a.C {
+    public final /*constructor*/ fun <init>(): d.A
+    protected open override /*1*/ fun clone(): jet.Any
+    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
+    protected open override /*1*/ fun finalize(): jet.Tuple0
+    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
+    public open override /*1*/ fun hashCode(): jet.Int
+    invisible_fake abstract override /*1*/ var myValue: jet.Int
+    public final override /*1*/ fun notify(): jet.Tuple0
+    public final override /*1*/ fun notifyAll(): jet.Tuple0
+    internal final fun test(): jet.Tuple0
+    public open override /*1*/ fun toString(): jet.String?
+    public final override /*1*/ fun wait(): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
+}
+// </namespace name="d">
diff --git a/compiler/testData/lazyResolve/diagnostics/scopes/visibility2.txt b/compiler/testData/lazyResolve/diagnostics/scopes/visibility2.txt
index c7a1fef0d29..71f149fd12f 100644
--- a/compiler/testData/lazyResolve/diagnostics/scopes/visibility2.txt
+++ b/compiler/testData/lazyResolve/diagnostics/scopes/visibility2.txt
@@ -16,7 +16,7 @@ namespace b
 
 internal final class b.B : a.A {
     public final /*constructor*/ fun <init>(): b.B
-    invisible_fake final override /*1*/ fun bar(): jet.Tuple0
+    invisible_fake abstract override /*1*/ fun bar(): jet.Tuple0
 }
 internal final class b.NewClass : java.util.ArrayList<java.lang.Integer> {
     public final /*constructor*/ fun <init>(): b.NewClass
@@ -25,10 +25,15 @@ internal final class b.NewClass : java.util.ArrayList<java.lang.Integer> {
     public open override /*1*/ fun addAll(/*0*/ p0: java.util.Collection<out java.lang.Integer>): jet.Boolean
     public open override /*1*/ fun addAll(/*0*/ p0: jet.Int, /*1*/ p1: java.util.Collection<out java.lang.Integer>): jet.Boolean
     public open override /*1*/ fun clear(): jet.Tuple0
+    public open override /*1*/ fun clone(): jet.Any
     public open override /*1*/ fun contains(/*0*/ p0: jet.Any?): jet.Boolean
     public open override /*1*/ fun containsAll(/*0*/ p0: java.util.Collection<out jet.Any?>): jet.Boolean
     public open override /*1*/ fun ensureCapacity(/*0*/ p0: jet.Int): jet.Tuple0
+    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
+    protected open override /*1*/ fun finalize(): jet.Tuple0
     public open override /*1*/ fun get(/*0*/ p0: jet.Int): java.lang.Integer
+    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
+    public open override /*1*/ fun hashCode(): jet.Int
     public open override /*1*/ fun indexOf(/*0*/ p0: jet.Any?): jet.Int
     public open override /*1*/ fun isEmpty(): jet.Boolean
     public open override /*1*/ fun iterator(): java.util.Iterator<java.lang.Integer>
@@ -36,6 +41,8 @@ internal final class b.NewClass : java.util.ArrayList<java.lang.Integer> {
     public open override /*1*/ fun listIterator(): java.util.ListIterator<java.lang.Integer>
     public open override /*1*/ fun listIterator(/*0*/ p0: jet.Int): java.util.ListIterator<java.lang.Integer>
     protected final override /*1*/ var modCount: jet.Int
+    public final override /*1*/ fun notify(): jet.Tuple0
+    public final override /*1*/ fun notifyAll(): jet.Tuple0
     public open override /*1*/ fun remove(/*0*/ p0: jet.Any?): jet.Boolean
     public open override /*1*/ fun remove(/*0*/ p0: jet.Int): java.lang.Integer
     public open override /*1*/ fun removeAll(/*0*/ p0: java.util.Collection<out jet.Any?>): jet.Boolean
@@ -46,7 +53,11 @@ internal final class b.NewClass : java.util.ArrayList<java.lang.Integer> {
     public open override /*1*/ fun subList(/*0*/ p0: jet.Int, /*1*/ p1: jet.Int): java.util.List<java.lang.Integer>
     public open override /*1*/ fun toArray(): jet.Array<jet.Any?>
     public open override /*1*/ fun </*0*/ T : jet.Any?>toArray(/*0*/ p0: jet.Array<T>): jet.Array<T>
+    public open override /*1*/ fun toString(): jet.String
     public open override /*1*/ fun trimToSize(): jet.Tuple0
+    public final override /*1*/ fun wait(): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
 }
 internal final class b.Q : jet.Any {
     public final /*constructor*/ fun <init>(): b.Q
diff --git a/compiler/testData/lazyResolve/diagnostics/subtyping/kt-1457.txt b/compiler/testData/lazyResolve/diagnostics/subtyping/kt-1457.txt
index 4e199aaf64d..f0b10eeb816 100644
--- a/compiler/testData/lazyResolve/diagnostics/subtyping/kt-1457.txt
+++ b/compiler/testData/lazyResolve/diagnostics/subtyping/kt-1457.txt
@@ -7,10 +7,15 @@ internal final class MyListOfPairs</*0*/ T : jet.Any?> : java.util.ArrayList<jet
     public open override /*1*/ fun addAll(/*0*/ p0: java.util.Collection<out jet.Tuple2<out T, out T>>): jet.Boolean
     public open override /*1*/ fun addAll(/*0*/ p0: jet.Int, /*1*/ p1: java.util.Collection<out jet.Tuple2<out T, out T>>): jet.Boolean
     public open override /*1*/ fun clear(): jet.Tuple0
+    public open override /*1*/ fun clone(): jet.Any
     public open override /*1*/ fun contains(/*0*/ p0: jet.Any?): jet.Boolean
     public open override /*1*/ fun containsAll(/*0*/ p0: java.util.Collection<out jet.Any?>): jet.Boolean
     public open override /*1*/ fun ensureCapacity(/*0*/ p0: jet.Int): jet.Tuple0
+    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
+    protected open override /*1*/ fun finalize(): jet.Tuple0
     public open override /*1*/ fun get(/*0*/ p0: jet.Int): jet.Tuple2<out T, out T>
+    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
+    public open override /*1*/ fun hashCode(): jet.Int
     public open override /*1*/ fun indexOf(/*0*/ p0: jet.Any?): jet.Int
     public open override /*1*/ fun isEmpty(): jet.Boolean
     public open override /*1*/ fun iterator(): java.util.Iterator<jet.Tuple2<out T, out T>>
@@ -18,6 +23,8 @@ internal final class MyListOfPairs</*0*/ T : jet.Any?> : java.util.ArrayList<jet
     public open override /*1*/ fun listIterator(): java.util.ListIterator<jet.Tuple2<out T, out T>>
     public open override /*1*/ fun listIterator(/*0*/ p0: jet.Int): java.util.ListIterator<jet.Tuple2<out T, out T>>
     protected final override /*1*/ var modCount: jet.Int
+    public final override /*1*/ fun notify(): jet.Tuple0
+    public final override /*1*/ fun notifyAll(): jet.Tuple0
     public open override /*1*/ fun remove(/*0*/ p0: jet.Any?): jet.Boolean
     public open override /*1*/ fun remove(/*0*/ p0: jet.Int): jet.Tuple2<out T, out T>
     public open override /*1*/ fun removeAll(/*0*/ p0: java.util.Collection<out jet.Any?>): jet.Boolean
@@ -28,6 +35,10 @@ internal final class MyListOfPairs</*0*/ T : jet.Any?> : java.util.ArrayList<jet
     public open override /*1*/ fun subList(/*0*/ p0: jet.Int, /*1*/ p1: jet.Int): java.util.List<jet.Tuple2<out T, out T>>
     public open override /*1*/ fun toArray(): jet.Array<jet.Any?>
     public open override /*1*/ fun </*0*/ T : jet.Any?>toArray(/*0*/ p0: jet.Array<T>): jet.Array<T>
+    public open override /*1*/ fun toString(): jet.String?
     public open override /*1*/ fun trimToSize(): jet.Tuple0
+    public final override /*1*/ fun wait(): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
 }
 internal final fun test(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/subtyping/kt304.txt b/compiler/testData/lazyResolve/diagnostics/subtyping/kt304.txt
new file mode 100644
index 00000000000..76554c26029
--- /dev/null
+++ b/compiler/testData/lazyResolve/diagnostics/subtyping/kt304.txt
@@ -0,0 +1,8 @@
+namespace <root>
+
+internal open class Bar</*0*/ T : jet.Any?> : jet.Any {
+    public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): Bar<T>
+}
+internal open class Foo {
+    public final /*constructor*/ fun <init>(): Foo
+}
diff --git a/compiler/testData/lazyResolve/diagnostics/varargs/MostSepcificVarargsWithJava.txt b/compiler/testData/lazyResolve/diagnostics/varargs/MostSepcificVarargsWithJava.txt
index 1f37d7bfc50..f00f3396a96 100644
--- a/compiler/testData/lazyResolve/diagnostics/varargs/MostSepcificVarargsWithJava.txt
+++ b/compiler/testData/lazyResolve/diagnostics/varargs/MostSepcificVarargsWithJava.txt
@@ -2,10 +2,21 @@ namespace <root>
 
 public open class C : java.lang.Object {
     public final /*constructor*/ fun <init>(): C
+    protected open override /*1*/ fun clone(): jet.Any
+    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
+    protected open override /*1*/ fun finalize(): jet.Tuple0
     package open fun from(): jet.Tuple0
     package open fun from(/*0*/ s1: jet.String?, /*1*/ vararg s: jet.String? /*jet.Array<jet.String?>*/): jet.Tuple0
     package open fun from(/*0*/ s: jet.String?): jet.Tuple0
     package open fun from(/*0*/ s: jet.String?, /*1*/ s1: jet.String?): jet.Tuple0
     package open fun from(/*0*/ vararg s: jet.String? /*jet.Array<jet.String?>*/): jet.Tuple0
+    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
+    public open override /*1*/ fun hashCode(): jet.Int
+    public final override /*1*/ fun notify(): jet.Tuple0
+    public final override /*1*/ fun notifyAll(): jet.Tuple0
+    public open override /*1*/ fun toString(): jet.String?
+    public final override /*1*/ fun wait(): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
 }
 internal final fun main(/*0*/ j: C, /*1*/ s: jet.Array<jet.String?>): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/varargs/kt1781.txt b/compiler/testData/lazyResolve/diagnostics/varargs/kt1781.txt
index eb653699101..88be3c0d0ec 100644
--- a/compiler/testData/lazyResolve/diagnostics/varargs/kt1781.txt
+++ b/compiler/testData/lazyResolve/diagnostics/varargs/kt1781.txt
@@ -3,5 +3,16 @@ namespace <root>
 public open class JavaClass : java.lang.Object {
     public final /*constructor*/ fun <init>(): JavaClass
     public final /*constructor*/ fun <init>(/*0*/ vararg ss: jet.String? /*jet.Array<jet.String?>*/): JavaClass
+    protected open override /*1*/ fun clone(): jet.Any
+    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
+    protected open override /*1*/ fun finalize(): jet.Tuple0
+    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
+    public open override /*1*/ fun hashCode(): jet.Int
+    public final override /*1*/ fun notify(): jet.Tuple0
+    public final override /*1*/ fun notifyAll(): jet.Tuple0
+    public open override /*1*/ fun toString(): jet.String?
+    public final override /*1*/ fun wait(): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
 }
 internal final fun foo(): jet.Tuple0
diff --git a/compiler/testData/lazyResolve/diagnostics/varargs/kt1835.txt b/compiler/testData/lazyResolve/diagnostics/varargs/kt1835.txt
index 39182329abd..4bc629c2035 100644
--- a/compiler/testData/lazyResolve/diagnostics/varargs/kt1835.txt
+++ b/compiler/testData/lazyResolve/diagnostics/varargs/kt1835.txt
@@ -2,7 +2,18 @@ namespace <root>
 
 public open class JavaClass : java.lang.Object {
     public final /*constructor*/ fun <init>(): JavaClass
+    protected open override /*1*/ fun clone(): jet.Any
+    public open override /*1*/ fun equals(/*0*/ p0: jet.Any?): jet.Boolean
+    protected open override /*1*/ fun finalize(): jet.Tuple0
     package open fun from(/*0*/ s: jet.String?): jet.Tuple0
     package open fun from(/*0*/ vararg s: jet.String? /*jet.Array<jet.String?>*/): jet.Tuple0
+    public final override /*1*/ fun getClass(): java.lang.Class<out jet.Any?>?
+    public open override /*1*/ fun hashCode(): jet.Int
+    public final override /*1*/ fun notify(): jet.Tuple0
+    public final override /*1*/ fun notifyAll(): jet.Tuple0
+    public open override /*1*/ fun toString(): jet.String?
+    public final override /*1*/ fun wait(): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long): jet.Tuple0
+    public final override /*1*/ fun wait(/*0*/ p0: jet.Long, /*1*/ p1: jet.Int): jet.Tuple0
 }
 internal final fun main(/*0*/ args: jet.Array<jet.String>): jet.Tuple0