diff --git a/compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.java b/compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.java
index 530133698c1..4dd6059f4df 100644
--- a/compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.java
+++ b/compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.java
@@ -2,6 +2,6 @@ package test;
 
 class GenericProperty {
     void foo() {
-        java.util.Map<?, ?> o = TestPackage.getTest();
+        java.util.Map<String, Integer> o = TestPackage.getTest(new java.util.HashMap<Integer, String>());
     }
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.kt b/compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.kt
index 6c2dde26791..e54b6940c74 100644
--- a/compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.kt
+++ b/compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.kt
@@ -2,5 +2,5 @@ package test
 
 // Tests that type variables of properties are written to the getter signature
 
-val <K, V> test: Map<K, V>
-    get() = java.util.HashMap()
+val <K, V> Map<K, V>.test: Map<V, K>
+    get() = this as Map<V, K>
diff --git a/compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.txt b/compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.txt
index 1565b69f681..6b65b22227d 100644
--- a/compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.txt
@@ -1,6 +1,6 @@
 package test
 
-public val </*0*/ K, /*1*/ V> test: kotlin.Map<K, V>
+public val </*0*/ K, /*1*/ V> kotlin.Map<K, V>.test: kotlin.Map<V, K>
 
 public/*package*/ open class GenericProperty {
     public/*package*/ constructor GenericProperty()
diff --git a/compiler/testData/diagnostics/tests/CovariantOverrideType.kt b/compiler/testData/diagnostics/tests/CovariantOverrideType.kt
index b3cfc4ff9be..ed3e349603c 100644
--- a/compiler/testData/diagnostics/tests/CovariantOverrideType.kt
+++ b/compiler/testData/diagnostics/tests/CovariantOverrideType.kt
@@ -1,16 +1,16 @@
-interface A {
+interface A<H> {
     fun foo() : Int = 1
     fun foo2() : Int = 1
     fun foo1() : Int = 1
     val a : Int
     val a1 : Int
-    val <T> g : Iterator<T>
+    val g : Iterator<H>
 
     fun <T> g() : T
     fun <T> g1() : T
 }
 
-abstract class B() : A {
+abstract class B<H>() : A<H> {
     override fun <!RETURN_TYPE_MISMATCH_ON_OVERRIDE!>foo<!>() {
     }
     override fun foo2() : <!RETURN_TYPE_MISMATCH_ON_OVERRIDE!>Unit<!> {
@@ -22,5 +22,5 @@ abstract class B() : A {
     abstract override fun <X> g() : <!RETURN_TYPE_MISMATCH_ON_OVERRIDE!>Int<!>
     abstract override fun <X> g1() : <!RETURN_TYPE_MISMATCH_ON_OVERRIDE!>List<X><!>
 
-    abstract override val <X> g : <!RETURN_TYPE_MISMATCH_ON_OVERRIDE!>Iterator<Int><!>
+    abstract override val g : <!RETURN_TYPE_MISMATCH_ON_OVERRIDE!>Iterator<Int><!>
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/CovariantOverrideType.txt b/compiler/testData/diagnostics/tests/CovariantOverrideType.txt
index f26733c63cf..a7db6f5e8e8 100644
--- a/compiler/testData/diagnostics/tests/CovariantOverrideType.txt
+++ b/compiler/testData/diagnostics/tests/CovariantOverrideType.txt
@@ -1,9 +1,9 @@
 package
 
-public interface A {
+public interface A</*0*/ H> {
     public abstract val a: kotlin.Int
     public abstract val a1: kotlin.Int
-    public abstract val </*0*/ T> g: kotlin.Iterator<T>
+    public abstract val g: kotlin.Iterator<H>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open fun foo(): kotlin.Int
     public open fun foo1(): kotlin.Int
@@ -14,11 +14,11 @@ public interface A {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public abstract class B : A {
-    public constructor B()
+public abstract class B</*0*/ H> : A<H> {
+    public constructor B</*0*/ H>()
     public open override /*1*/ val a: kotlin.Double = 1.0.toDouble()
     public open override /*1*/ val a1: kotlin.Double = 1.0.toDouble()
-    public abstract override /*1*/ val </*0*/ X> g: kotlin.Iterator<kotlin.Int>
+    public abstract override /*1*/ val g: kotlin.Iterator<kotlin.Int>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ fun foo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun foo1(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/MultipleBounds.kt b/compiler/testData/diagnostics/tests/MultipleBounds.kt
index f7e40d83c73..a4ef617d631 100644
--- a/compiler/testData/diagnostics/tests/MultipleBounds.kt
+++ b/compiler/testData/diagnostics/tests/MultipleBounds.kt
@@ -9,9 +9,9 @@ interface B {
 }
 
 interface G<X> {
-    val <X> boo: Double  where X : A, X : B
-    val <A> bal: Double  where A : B
-    val <Y> bas: Double where Y : B, <!NAME_IN_CONSTRAINT_IS_NOT_A_TYPE_PARAMETER!>X<!> : B
+    val <<!TYPE_PARAMETER_OF_PROPERTY_NOT_USED_IN_RECEIVER!>X<!>> boo: Double  where X : A, X : B
+    val <<!TYPE_PARAMETER_OF_PROPERTY_NOT_USED_IN_RECEIVER!>A<!>> bal: Double  where A : B
+    val <<!TYPE_PARAMETER_OF_PROPERTY_NOT_USED_IN_RECEIVER!>Y<!>> bas: Double where Y : B, <!NAME_IN_CONSTRAINT_IS_NOT_A_TYPE_PARAMETER!>X<!> : B
 }
 
 class C() : A(), B
@@ -66,4 +66,4 @@ val t1 = test2<<!UPPER_BOUND_VIOLATED!>A<!>>(A())
 val t2 = test2<<!UPPER_BOUND_VIOLATED!>B<!>>(C())
 val t3 = test2<C>(C())
 
-val <T, B : T> x : Int = 0
\ No newline at end of file
+val <<!TYPE_PARAMETER_OF_PROPERTY_NOT_USED_IN_RECEIVER!>T<!>, <!TYPE_PARAMETER_OF_PROPERTY_NOT_USED_IN_RECEIVER!>B : T<!>> x : Int = 0
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotationsForPropertyTypeParameter.kt b/compiler/testData/diagnostics/tests/annotations/AnnotationsForPropertyTypeParameter.kt
index a76a4739286..df4c0e3a99f 100644
--- a/compiler/testData/diagnostics/tests/annotations/AnnotationsForPropertyTypeParameter.kt
+++ b/compiler/testData/diagnostics/tests/annotations/AnnotationsForPropertyTypeParameter.kt
@@ -1,10 +1,10 @@
 annotation class A1
 annotation class A2(val some: Int = 12)
 
-val <<!UNSUPPORTED!>@A1<!> <!UNSUPPORTED!>@A2(3)<!> <!UNSUPPORTED!>@A2<!> <!UNSUPPORTED!>@A1(12)<!> <!UNSUPPORTED!>@A2("Test")<!>  T> topProp = 12
+val <<!UNSUPPORTED!>@A1<!> <!UNSUPPORTED!>@A2(3)<!> <!UNSUPPORTED!>@A2<!> <!UNSUPPORTED!>@A1(12)<!> <!UNSUPPORTED!>@A2("Test")<!>  T> T.topProp: Int get() = 12
 
 class SomeClass {
-    val <<!UNSUPPORTED!>@A1<!> <!UNSUPPORTED!>@A2(3)<!> <!UNSUPPORTED!>@A2<!> <!UNSUPPORTED!>@A1(12)<!> <!UNSUPPORTED!>@A2("Test")<!> T> field = 12
+    val <<!UNSUPPORTED!>@A1<!> <!UNSUPPORTED!>@A2(3)<!> <!UNSUPPORTED!>@A2<!> <!UNSUPPORTED!>@A1(12)<!> <!UNSUPPORTED!>@A2("Test")<!> T> T.field: Int get() = 12
 
     fun foo() {
         val <<!UNSUPPORTED!>@A1<!> <!UNSUPPORTED!>@A2(3)<!> <!UNSUPPORTED!>@A2<!> <!UNSUPPORTED!>@A1(12)<!> <!UNSUPPORTED!>@A2("Test")<!> T> <!UNUSED_VARIABLE!>localVal<!> = 12
diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotationsForPropertyTypeParameter.txt b/compiler/testData/diagnostics/tests/annotations/AnnotationsForPropertyTypeParameter.txt
index d2748f06dc2..23daa6d70cc 100644
--- a/compiler/testData/diagnostics/tests/annotations/AnnotationsForPropertyTypeParameter.txt
+++ b/compiler/testData/diagnostics/tests/annotations/AnnotationsForPropertyTypeParameter.txt
@@ -1,6 +1,6 @@
 package
 
-public val </*0*/ T> topProp: kotlin.Int = 12
+public val </*0*/ T> T.topProp: kotlin.Int
 
 @kotlin.annotation.annotation() public final class A1 : kotlin.Annotation {
     public constructor A1()
@@ -19,7 +19,7 @@ public val </*0*/ T> topProp: kotlin.Int = 12
 
 public final class SomeClass {
     public constructor SomeClass()
-    public final val </*0*/ T> field: kotlin.Int = 12
+    public final val </*0*/ T> T.field: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final fun foo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/InProperty.kt b/compiler/testData/diagnostics/tests/generics/tpAsReified/InProperty.kt
index 55431d2d0f0..0bbc77f3ef1 100644
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/InProperty.kt
+++ b/compiler/testData/diagnostics/tests/generics/tpAsReified/InProperty.kt
@@ -1,15 +1,2 @@
-val <<!REIFIED_TYPE_PARAMETER_NO_INLINE!>reified<!> T> v: T
+val <<!REIFIED_TYPE_PARAMETER_NO_INLINE!>reified<!> T> T.v: T
     get() = throw UnsupportedOperationException()
-
-fun <T> id(p: T): T = p
-
-fun <A> main() {
-    val <!UNUSED_VARIABLE!>a<!> = <!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER, DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>v<!>
-
-    val <!UNUSED_VARIABLE!>b<!>: A = <!TYPE_PARAMETER_AS_REIFIED!>v<!>
-
-    val <!UNUSED_VARIABLE!>c<!>: Int = v
-
-    // TODO svtk, uncomment when extensions are called for nested calls!
-    //val < !UNUSED_VARIABLE!>d< !>: A = id(< !TYPE_PARAMETER_AS_REIFIED!>v< !>)
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/InProperty.txt b/compiler/testData/diagnostics/tests/generics/tpAsReified/InProperty.txt
index d7e6d619087..1b7cfa58dc0 100644
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/InProperty.txt
+++ b/compiler/testData/diagnostics/tests/generics/tpAsReified/InProperty.txt
@@ -1,5 +1,3 @@
 package
 
-public val </*0*/ reified T> v: T
-public fun </*0*/ T> id(/*0*/ p: T): T
-public fun </*0*/ A> main(): kotlin.Unit
+public val </*0*/ reified T> T.v: T
diff --git a/compiler/testData/diagnostics/tests/kt53.kt b/compiler/testData/diagnostics/tests/kt53.kt
index 0c9da0867c0..6b31ad04a19 100644
--- a/compiler/testData/diagnostics/tests/kt53.kt
+++ b/compiler/testData/diagnostics/tests/kt53.kt
@@ -1,4 +1,4 @@
-val <T, E> T.foo : E<!BASE_WITH_NULLABLE_UPPER_BOUND!>?<!>
+val <T> T.foo : T<!BASE_WITH_NULLABLE_UPPER_BOUND!>?<!>
     get() = null
 
 fun test(): Int? {
diff --git a/compiler/testData/diagnostics/tests/kt53.txt b/compiler/testData/diagnostics/tests/kt53.txt
index d08b3a4928a..b82081483ac 100644
--- a/compiler/testData/diagnostics/tests/kt53.txt
+++ b/compiler/testData/diagnostics/tests/kt53.txt
@@ -1,4 +1,4 @@
 package
 
-public val </*0*/ T, /*1*/ E> T.foo: E?
+public val </*0*/ T> T.foo: T?
 public fun test(): kotlin.Int?
diff --git a/compiler/testData/diagnostics/tests/override/ComplexValRedeclaration.kt b/compiler/testData/diagnostics/tests/override/ComplexValRedeclaration.kt
index 24c27d44bfb..b5bd0f1c3cc 100644
--- a/compiler/testData/diagnostics/tests/override/ComplexValRedeclaration.kt
+++ b/compiler/testData/diagnostics/tests/override/ComplexValRedeclaration.kt
@@ -1,3 +1,4 @@
+// !DIAGNOSTICS: -TYPE_PARAMETER_OF_PROPERTY_NOT_USED_IN_RECEIVER
 package override.generics
 
 abstract class MyAbstractClass<T> {
diff --git a/compiler/testData/diagnostics/tests/override/ConflictingPropertySignatureFromSuperclass.kt b/compiler/testData/diagnostics/tests/override/ConflictingPropertySignatureFromSuperclass.kt
index c38f3682183..3854e259271 100644
--- a/compiler/testData/diagnostics/tests/override/ConflictingPropertySignatureFromSuperclass.kt
+++ b/compiler/testData/diagnostics/tests/override/ConflictingPropertySignatureFromSuperclass.kt
@@ -1,3 +1,4 @@
+// !DIAGNOSTICS: -TYPE_PARAMETER_OF_PROPERTY_NOT_USED_IN_RECEIVER
 open class Aaa() {
     val bar = 1
 }
diff --git a/compiler/testData/diagnostics/tests/override/Generics.kt b/compiler/testData/diagnostics/tests/override/Generics.kt
index 2d042fa9527..8d83081ba5d 100644
--- a/compiler/testData/diagnostics/tests/override/Generics.kt
+++ b/compiler/testData/diagnostics/tests/override/Generics.kt
@@ -43,7 +43,7 @@ abstract class MyAbstractClass1 : MyTrait<Int>, MyAbstractClass<String>() {
 <!ABSTRACT_CLASS_MEMBER_NOT_IMPLEMENTED!>class MyIllegalGenericClass1<!><T> : MyTrait<T>, MyAbstractClass<T>() {}
 <!ABSTRACT_CLASS_MEMBER_NOT_IMPLEMENTED!>class MyIllegalGenericClass2<!><T, R>(r : R) : MyTrait<T>, MyAbstractClass<R>() {
     <!NOTHING_TO_OVERRIDE!>override<!> fun foo(r: R) = r
-    <!CONFLICTING_OVERLOADS!><!NOTHING_TO_OVERRIDE!>override<!> val <T> pr : R<!> = r
+    <!CONFLICTING_OVERLOADS!><!NOTHING_TO_OVERRIDE!>override<!> val <<!TYPE_PARAMETER_OF_PROPERTY_NOT_USED_IN_RECEIVER!>T<!>> pr : R<!> = r
 }
 <!ABSTRACT_CLASS_MEMBER_NOT_IMPLEMENTED!>class MyIllegalClass1<!> : MyTrait<Int>, MyAbstractClass<String>() {}
 abstract class MyLegalAbstractClass1 : MyTrait<Int>, MyAbstractClass<String>() {}
@@ -51,10 +51,10 @@ abstract class MyLegalAbstractClass1 : MyTrait<Int>, MyAbstractClass<String>() {
 <!ABSTRACT_CLASS_MEMBER_NOT_IMPLEMENTED!>class MyIllegalClass2<!><T>(t : T) : MyTrait<Int>, MyAbstractClass<Int>() {
     fun foo(t: T) = t
     fun bar(t: T) = t
-    <!CONFLICTING_OVERLOADS!>val <R> pr : T<!> = t
+    <!CONFLICTING_OVERLOADS!>val <<!TYPE_PARAMETER_OF_PROPERTY_NOT_USED_IN_RECEIVER!>R<!>> pr : T<!> = t
 }
 abstract class MyLegalAbstractClass2<T>(t : T) : MyTrait<Int>, MyAbstractClass<Int>() {
     fun foo(t: T) = t
     fun bar(t: T) = t
-    <!CONFLICTING_OVERLOADS!>val <R> pr : T<!> = t
+    <!CONFLICTING_OVERLOADS!>val <<!TYPE_PARAMETER_OF_PROPERTY_NOT_USED_IN_RECEIVER!>R<!>> pr : T<!> = t
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/redeclarations/RedeclaredTypeParameters.kt b/compiler/testData/diagnostics/tests/redeclarations/RedeclaredTypeParameters.kt
index d4340deb6ef..29ffbbce3eb 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/RedeclaredTypeParameters.kt
+++ b/compiler/testData/diagnostics/tests/redeclarations/RedeclaredTypeParameters.kt
@@ -2,5 +2,5 @@ fun <<!REDECLARATION, REDECLARATION!>T<!>, <!REDECLARATION, REDECLARATION!>T<!>>
 
 class P<<!REDECLARATION!>T<!>, <!REDECLARATION!>T<!>> {}
 
-val <<!REDECLARATION, REDECLARATION, REDECLARATION!>T<!>, <!REDECLARATION, REDECLARATION, REDECLARATION!>T<!>> T.foo : Int
+val <<!REDECLARATION, REDECLARATION, REDECLARATION, TYPE_PARAMETER_OF_PROPERTY_NOT_USED_IN_RECEIVER!>T<!>, <!REDECLARATION, REDECLARATION, REDECLARATION!>T<!>> T.foo : Int
     get() = 1
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBound.kt b/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBound.kt
index 7bc7846fc26..fd37f7ee7e0 100644
--- a/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBound.kt
+++ b/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBound.kt
@@ -1,3 +1,3 @@
-// !DIAGNOSTICS: -MUST_BE_INITIALIZED
+// !DIAGNOSTICS: -MUST_BE_INITIALIZED -TYPE_PARAMETER_OF_PROPERTY_NOT_USED_IN_RECEIVER
 fun <T: <!CYCLIC_GENERIC_UPPER_BOUND!>T?<!>> foo() {}
 val <T: <!CYCLIC_GENERIC_UPPER_BOUND!>T?<!>> prop
diff --git a/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundMember.kt b/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundMember.kt
index 91cc9ac8fc2..bd0f7d0094e 100644
--- a/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundMember.kt
+++ b/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundMember.kt
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -MUST_BE_INITIALIZED_OR_BE_ABSTRACT
+// !DIAGNOSTICS: -MUST_BE_INITIALIZED_OR_BE_ABSTRACT -TYPE_PARAMETER_OF_PROPERTY_NOT_USED_IN_RECEIVER
 class My {
     fun <T: <!CYCLIC_GENERIC_UPPER_BOUND!>T?<!>> foo() {}
     val <T: <!CYCLIC_GENERIC_UPPER_BOUND!>T?<!>> prop: T
diff --git a/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundNotNull.kt b/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundNotNull.kt
index 3700e3f4236..d7cb5e2afe3 100644
--- a/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundNotNull.kt
+++ b/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundNotNull.kt
@@ -1,3 +1,3 @@
-// !DIAGNOSTICS: -MUST_BE_INITIALIZED
+// !DIAGNOSTICS: -MUST_BE_INITIALIZED -TYPE_PARAMETER_OF_PROPERTY_NOT_USED_IN_RECEIVER
 fun <T: <!CYCLIC_GENERIC_UPPER_BOUND!>T<!>> foo() {}
 val <T: <!CYCLIC_GENERIC_UPPER_BOUND!>T?<!>> prop: T
diff --git a/compiler/testData/diagnostics/tests/typeParameters/upperBoundCannotBeArray.kt b/compiler/testData/diagnostics/tests/typeParameters/upperBoundCannotBeArray.kt
index df667b56306..62cc753059a 100644
--- a/compiler/testData/diagnostics/tests/typeParameters/upperBoundCannotBeArray.kt
+++ b/compiler/testData/diagnostics/tests/typeParameters/upperBoundCannotBeArray.kt
@@ -6,7 +6,7 @@ fun <<!UPPER_BOUND_CANNOT_BE_ARRAY!>T : <!FINAL_UPPER_BOUND!>IntArray<!><!>> f4(
 
 fun <<!UPPER_BOUND_CANNOT_BE_ARRAY!>T<!>> f5() where T : Array<Any> {}
 
-val <<!UPPER_BOUND_CANNOT_BE_ARRAY!>T : Array<Any?><!>> v = ""
+val <<!UPPER_BOUND_CANNOT_BE_ARRAY!>T : Array<Any?><!>> T.v: String get() = ""
 
 class C2<T, <!UPPER_BOUND_CANNOT_BE_ARRAY!>A : Array<out T><!>>
 interface C3<S, T : S, <!UPPER_BOUND_CANNOT_BE_ARRAY!>A<!>> where A : Array<out S>, A : Array<out T>
diff --git a/compiler/testData/diagnostics/tests/typeParameters/upperBoundCannotBeArray.txt b/compiler/testData/diagnostics/tests/typeParameters/upperBoundCannotBeArray.txt
index fa7c8bdb116..502a1732bc0 100644
--- a/compiler/testData/diagnostics/tests/typeParameters/upperBoundCannotBeArray.txt
+++ b/compiler/testData/diagnostics/tests/typeParameters/upperBoundCannotBeArray.txt
@@ -1,6 +1,6 @@
 package
 
-public val </*0*/ T : kotlin.Array<kotlin.Any?>> v: kotlin.String = ""
+public val </*0*/ T : kotlin.Array<kotlin.Any?>> T.v: kotlin.String
 public fun </*0*/ A : kotlin.Array<kotlin.Any>> f1(): kotlin.Unit
 public fun </*0*/ T, /*1*/ A : kotlin.Array<out T>> f2(): kotlin.Unit
 public fun </*0*/ S, /*1*/ T : S, /*2*/ A : kotlin.Array<out S>> f3(): kotlin.Unit where A : kotlin.Array<out T>
diff --git a/compiler/testData/diagnostics/tests/variance/ValProperty.kt b/compiler/testData/diagnostics/tests/variance/ValProperty.kt
index a37feea87d6..44bc4f6c705 100644
--- a/compiler/testData/diagnostics/tests/variance/ValProperty.kt
+++ b/compiler/testData/diagnostics/tests/variance/ValProperty.kt
@@ -34,15 +34,15 @@ abstract class Test<in I, out O, P> {
     abstract val In<<!TYPE_VARIANCE_CONFLICT(I; in; out; In<I>)!>I<!>>.receiver4: Int
     abstract val In<O>.receiver5: Int
 
-    val <X : I> typeParameter1 = 8
-    val <X : <!TYPE_VARIANCE_CONFLICT(O; out; in; O)!>O<!>> typeParameter2 = 13
-    val <X : P> typeParameter3 = 21
-    val <X : In<<!TYPE_VARIANCE_CONFLICT(I; in; out; In<I>)!>I<!>>> typeParameter4 = 34
-    val <X : In<O>> typeParameter5 = 55
+    val <X : I> X.typeParameter1: Int get() = 0
+    val <X : <!TYPE_VARIANCE_CONFLICT(O; out; in; O)!>O<!>> X.typeParameter2: Int get() = 0
+    val <X : P> X.typeParameter3: Int get() = 0
+    val <X : In<<!TYPE_VARIANCE_CONFLICT(I; in; out; In<I>)!>I<!>>> X.typeParameter4: Int get() = 0
+    val <X : In<O>> X.typeParameter5: Int get() = 0
 
-    val <X> typeParameter6 where X : I = 1
-    val <X> typeParameter7 where X : <!TYPE_VARIANCE_CONFLICT(O; out; in; O)!>O<!> = 1
-    val <X> typeParameter8 where X : P = 2
-    val <X> typeParameter9 where X : In<<!TYPE_VARIANCE_CONFLICT(I; in; out; In<I>)!>I<!>> = 3
-    val <X> typeParameter0 where X : In<O> = 5
+    val <X> X.typeParameter6: Int where X : I get() = 0
+    val <X> X.typeParameter7: Int where X : <!TYPE_VARIANCE_CONFLICT(O; out; in; O)!>O<!> get() = 0
+    val <X> X.typeParameter8: Int where X : P get() = 0
+    val <X> X.typeParameter9: Int where X : In<<!TYPE_VARIANCE_CONFLICT(I; in; out; In<I>)!>I<!>> get() = 0
+    val <X> X.typeParameter0: Int where X : In<O> get() = 0
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/variance/ValProperty.txt b/compiler/testData/diagnostics/tests/variance/ValProperty.txt
index d09b0f35031..334cfb6e482 100644
--- a/compiler/testData/diagnostics/tests/variance/ValProperty.txt
+++ b/compiler/testData/diagnostics/tests/variance/ValProperty.txt
@@ -46,21 +46,21 @@ public abstract class Test</*0*/ in I, /*1*/ out O, /*2*/ P> {
     public abstract val type3: P
     public abstract val type4: In<I>
     public abstract val type5: In<O>
-    public final val </*0*/ X : In<O>> typeParameter0: kotlin.Int = 5
-    public final val </*0*/ X : I> typeParameter1: kotlin.Int = 8
-    public final val </*0*/ X : O> typeParameter2: kotlin.Int = 13
-    public final val </*0*/ X : P> typeParameter3: kotlin.Int = 21
-    public final val </*0*/ X : In<I>> typeParameter4: kotlin.Int = 34
-    public final val </*0*/ X : In<O>> typeParameter5: kotlin.Int = 55
-    public final val </*0*/ X : I> typeParameter6: kotlin.Int = 1
-    public final val </*0*/ X : O> typeParameter7: kotlin.Int = 1
-    public final val </*0*/ X : P> typeParameter8: kotlin.Int = 2
-    public final val </*0*/ X : In<I>> typeParameter9: kotlin.Int = 3
     public abstract val I.receiver1: kotlin.Int
     public abstract val O.receiver2: kotlin.Int
     public abstract val P.receiver3: kotlin.Int
     public abstract val In<I>.receiver4: kotlin.Int
     public abstract val In<O>.receiver5: kotlin.Int
+    public final val </*0*/ X : In<O>> X.typeParameter0: kotlin.Int
+    public final val </*0*/ X : I> X.typeParameter1: kotlin.Int
+    public final val </*0*/ X : O> X.typeParameter2: kotlin.Int
+    public final val </*0*/ X : P> X.typeParameter3: kotlin.Int
+    public final val </*0*/ X : In<I>> X.typeParameter4: kotlin.Int
+    public final val </*0*/ X : In<O>> X.typeParameter5: kotlin.Int
+    public final val </*0*/ X : I> X.typeParameter6: kotlin.Int
+    public final val </*0*/ X : O> X.typeParameter7: kotlin.Int
+    public final val </*0*/ X : P> X.typeParameter8: kotlin.Int
+    public final val </*0*/ X : In<I>> X.typeParameter9: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/variance/VarProperty.kt b/compiler/testData/diagnostics/tests/variance/VarProperty.kt
index 4465e2c66eb..daec37d510a 100644
--- a/compiler/testData/diagnostics/tests/variance/VarProperty.kt
+++ b/compiler/testData/diagnostics/tests/variance/VarProperty.kt
@@ -34,15 +34,15 @@ abstract class Test<in I, out O, P> {
     abstract var In<<!TYPE_VARIANCE_CONFLICT(I; in; out; In<I>)!>I<!>>.receiver4: Int
     abstract var In<O>.receiver5: Int
 
-    var <X : I> typeParameter1 = 8
-    var <X : <!TYPE_VARIANCE_CONFLICT(O; out; in; O)!>O<!>> typeParameter2 = 13
-    var <X : P> typeParameter3 = 21
-    var <X : In<<!TYPE_VARIANCE_CONFLICT(I; in; out; In<I>)!>I<!>>> typeParameter4 = 34
-    var <X : In<O>> typeParameter5 = 55
+    var <X : I> X.typeParameter1: Int get() = 0; set(i) {}
+    var <X : <!TYPE_VARIANCE_CONFLICT(O; out; in; O)!>O<!>> X.typeParameter2: Int get() = 0; set(i) {}
+    var <X : P> X.typeParameter3: Int get() = 0; set(i) {}
+    var <X : In<<!TYPE_VARIANCE_CONFLICT(I; in; out; In<I>)!>I<!>>> X.typeParameter4: Int get() = 0; set(i) {}
+    var <X : In<O>> X.typeParameter5: Int get() = 0; set(i) {}
 
-    var <X> typeParameter6 where X : I = 1
-    var <X> typeParameter7 where X : <!TYPE_VARIANCE_CONFLICT(O; out; in; O)!>O<!> = 1
-    var <X> typeParameter8 where X : P = 2
-    var <X> typeParameter9 where X : In<<!TYPE_VARIANCE_CONFLICT(I; in; out; In<I>)!>I<!>> = 3
-    var <X> typeParameter0 where X : In<O> = 5
+    var <X> X.typeParameter6: Int where X : I get() = 0; set(i) {}
+    var <X> X.typeParameter7: Int where X : <!TYPE_VARIANCE_CONFLICT(O; out; in; O)!>O<!> get() = 0; set(i) {}
+    var <X> X.typeParameter8: Int where X : P get() = 0; set(i) {}
+    var <X> X.typeParameter9: Int where X : In<<!TYPE_VARIANCE_CONFLICT(I; in; out; In<I>)!>I<!>> get() = 0; set(i) {}
+    var <X> X.typeParameter0: Int where X : In<O> get() = 0; set(i) {}
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/variance/VarProperty.txt b/compiler/testData/diagnostics/tests/variance/VarProperty.txt
index 62bb1ba4d1e..67dcfb7e67c 100644
--- a/compiler/testData/diagnostics/tests/variance/VarProperty.txt
+++ b/compiler/testData/diagnostics/tests/variance/VarProperty.txt
@@ -46,21 +46,21 @@ public abstract class Test</*0*/ in I, /*1*/ out O, /*2*/ P> {
     public abstract var type3: P
     public abstract var type4: In<I>
     public abstract var type5: In<O>
-    public final var </*0*/ X : In<O>> typeParameter0: kotlin.Int
-    public final var </*0*/ X : I> typeParameter1: kotlin.Int
-    public final var </*0*/ X : O> typeParameter2: kotlin.Int
-    public final var </*0*/ X : P> typeParameter3: kotlin.Int
-    public final var </*0*/ X : In<I>> typeParameter4: kotlin.Int
-    public final var </*0*/ X : In<O>> typeParameter5: kotlin.Int
-    public final var </*0*/ X : I> typeParameter6: kotlin.Int
-    public final var </*0*/ X : O> typeParameter7: kotlin.Int
-    public final var </*0*/ X : P> typeParameter8: kotlin.Int
-    public final var </*0*/ X : In<I>> typeParameter9: kotlin.Int
     public abstract var I.receiver1: kotlin.Int
     public abstract var O.receiver2: kotlin.Int
     public abstract var P.receiver3: kotlin.Int
     public abstract var In<I>.receiver4: kotlin.Int
     public abstract var In<O>.receiver5: kotlin.Int
+    public final var </*0*/ X : In<O>> X.typeParameter0: kotlin.Int
+    public final var </*0*/ X : I> X.typeParameter1: kotlin.Int
+    public final var </*0*/ X : O> X.typeParameter2: kotlin.Int
+    public final var </*0*/ X : P> X.typeParameter3: kotlin.Int
+    public final var </*0*/ X : In<I>> X.typeParameter4: kotlin.Int
+    public final var </*0*/ X : In<O>> X.typeParameter5: kotlin.Int
+    public final var </*0*/ X : I> X.typeParameter6: kotlin.Int
+    public final var </*0*/ X : O> X.typeParameter7: kotlin.Int
+    public final var </*0*/ X : P> X.typeParameter8: kotlin.Int
+    public final var </*0*/ X : In<I>> X.typeParameter9: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/native.kt b/compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/native.kt
index 5b9a9d9b664..779384f21c1 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/native.kt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/native.kt
@@ -1,3 +1,6 @@
+// !DIAGNOSTICS: -UNREACHABLE_CODE
+// unreachable code suppressed due to KT-9586
+
 @native
 val baz: Int
 @native
diff --git a/compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt b/compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt
index 21e77b5c055..9b901d2eede 100644
--- a/compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt
+++ b/compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt
@@ -6,6 +6,6 @@ class MembersReferenceOuterTP<P> {
         fun g(p: P): P = null!!
 
         val v: P = null!!
-        val <Q : P> w: Q = null!!
+        val <Q : P> Q.w: Q get() = null!!
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.txt b/compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.txt
index 6459d81e85a..8d9679918a2 100644
--- a/compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.txt
+++ b/compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.txt
@@ -7,8 +7,8 @@ public final class MembersReferenceOuterTP</*0*/ P> {
         /*primary*/ public constructor Inner()
         public final val v: P
             public final fun <get-v>(): P
-        public final val </*0*/ Q : P> w: Q
-            public final fun <get-w>(): Q
+        public final val </*0*/ Q : P> Q.w: Q
+            public final fun Q.<get-w>(): Q
         public final fun </*0*/ Q : P> f(): kotlin.Unit
         public final fun g(/*0*/ p: P): P
     }
diff --git a/idea/testData/checker/MultipleBounds.kt b/idea/testData/checker/MultipleBounds.kt
index 6a45c9d19be..c8ae3898b33 100644
--- a/idea/testData/checker/MultipleBounds.kt
+++ b/idea/testData/checker/MultipleBounds.kt
@@ -60,4 +60,6 @@ val t1 = test2<<error>A</error>>(A())
 val t2 = test2<<error>B</error>>(C())
 val t3 = test2<C>(C())
 
-val <T, B : T> x : Int = 0
+val <T, B: T> Pair<T, B>.x : Int get() = 0
+
+class Pair<A, B>()
diff --git a/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.kt b/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.kt
index 7fbf1086988..ad7681667c3 100644
--- a/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.kt
+++ b/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.kt
@@ -27,13 +27,13 @@ class TypeParams<in T1 : Any, out T2, T3 : (Int) -> Int, T4, T5 : Any?, T6 : T5,
     fun T1.withOwnParamExtensionAfterName<T1>(p: T1) {
     }
 
-    val <G1> withOwnParam: G1
+    val <G1> G1.withOwnParam: G1
         get() = throw IllegalStateException()
 
-    val <G1: Int?> withOwnBoundedParam: G1
+    val <G1: Int?> G1.withOwnBoundedParam: G1
         get() = throw IllegalStateException()
 
-    val <G1: T4> withOwnBoundedParamByOther: G1
+    val <G1: T4> G1.withOwnBoundedParamByOther: G1
         get() = throw IllegalStateException()
 
     val useSomeParam: T2
diff --git a/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt b/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt
index 2e73756f521..007ad2ea0f2 100644
--- a/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt
+++ b/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt
@@ -84,7 +84,7 @@ PsiJetFileStubImpl[package=test]
         TYPE_REFERENCE:
           USER_TYPE:[isAbsoluteInRootPackage=false]
             REFERENCE_EXPRESSION:[referencedName=T2]
-      PROPERTY:[fqName=test.TypeParams.withOwnBoundedParam, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=withOwnBoundedParam]
+      PROPERTY:[fqName=test.TypeParams.withOwnBoundedParam, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=true, isTopLevel=false, isVar=false, name=withOwnBoundedParam]
         MODIFIER_LIST:[public final]
         TYPE_PARAMETER_LIST:
           TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=G1]
@@ -97,7 +97,10 @@ PsiJetFileStubImpl[package=test]
         TYPE_REFERENCE:
           USER_TYPE:[isAbsoluteInRootPackage=false]
             REFERENCE_EXPRESSION:[referencedName=G1]
-      PROPERTY:[fqName=test.TypeParams.withOwnBoundedParamByOther, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=withOwnBoundedParamByOther]
+        TYPE_REFERENCE:
+          USER_TYPE:[isAbsoluteInRootPackage=false]
+            REFERENCE_EXPRESSION:[referencedName=G1]
+      PROPERTY:[fqName=test.TypeParams.withOwnBoundedParamByOther, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=true, isTopLevel=false, isVar=false, name=withOwnBoundedParamByOther]
         MODIFIER_LIST:[public final]
         TYPE_PARAMETER_LIST:
           TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=G1]
@@ -107,13 +110,19 @@ PsiJetFileStubImpl[package=test]
         TYPE_REFERENCE:
           USER_TYPE:[isAbsoluteInRootPackage=false]
             REFERENCE_EXPRESSION:[referencedName=G1]
-      PROPERTY:[fqName=test.TypeParams.withOwnParam, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=false, isTopLevel=false, isVar=false, name=withOwnParam]
+        TYPE_REFERENCE:
+          USER_TYPE:[isAbsoluteInRootPackage=false]
+            REFERENCE_EXPRESSION:[referencedName=G1]
+      PROPERTY:[fqName=test.TypeParams.withOwnParam, hasDelegate=false, hasDelegateExpression=false, hasInitializer=false, hasReturnTypeRef=true, isExtension=true, isTopLevel=false, isVar=false, name=withOwnParam]
         MODIFIER_LIST:[public final]
         TYPE_PARAMETER_LIST:
           TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=G1]
         TYPE_REFERENCE:
           USER_TYPE:[isAbsoluteInRootPackage=false]
             REFERENCE_EXPRESSION:[referencedName=G1]
+        TYPE_REFERENCE:
+          USER_TYPE:[isAbsoluteInRootPackage=false]
+            REFERENCE_EXPRESSION:[referencedName=G1]
       FUN:[fqName=test.TypeParams.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=true, isExtension=false, isTopLevel=false, name=f]
         MODIFIER_LIST:[public final]
           ANNOTATION_ENTRY:[hasValueArguments=false, shortName=inline]
diff --git a/idea/testData/intentions/declarations/convertMemberToExtension/genericProperty.kt b/idea/testData/intentions/declarations/convertMemberToExtension/genericProperty.kt
index 1e5e854d725..0b1b7aeb708 100644
--- a/idea/testData/intentions/declarations/convertMemberToExtension/genericProperty.kt
+++ b/idea/testData/intentions/declarations/convertMemberToExtension/genericProperty.kt
@@ -1,4 +1,5 @@
 // ERROR: Property must be initialized or be abstract
+// ERROR: Type parameter of a property must be used in its receiver type
 
 class Owner<T> {
     val <R> <caret>p: R
diff --git a/idea/testData/intentions/declarations/convertMemberToExtension/genericProperty.kt.after b/idea/testData/intentions/declarations/convertMemberToExtension/genericProperty.kt.after
index 1c16897cd39..74cc8703f7a 100644
--- a/idea/testData/intentions/declarations/convertMemberToExtension/genericProperty.kt.after
+++ b/idea/testData/intentions/declarations/convertMemberToExtension/genericProperty.kt.after
@@ -1,4 +1,5 @@
 // ERROR: Property must be initialized or be abstract
+// ERROR: Type parameter of a property must be used in its receiver type
 
 class Owner<T> {
 }
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenAccessorInClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenAccessorInClass.kt
index 589fdd6f87c..9f79fc57eb1 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenAccessorInClass.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenAccessorInClass.kt
@@ -5,7 +5,7 @@
 // ERROR: Unresolved reference: foo
 
 class A {
-    val <T> test: T get() {
+    val <T> T.test: T get() {
         return <caret>foo
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenAccessorInGenClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenAccessorInGenClass.kt
index 8454969d118..b5396688ff8 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenAccessorInGenClass.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenAccessorInGenClass.kt
@@ -5,7 +5,7 @@
 // ERROR: Unresolved reference: foo
 
 class A<T> {
-    val <T> test: T get() {
+    val <T> T.test: T get() {
         return <caret>foo
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenPropertyInitializerInClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenPropertyInitializerInClass.kt
deleted file mode 100644
index 6b9e1285883..00000000000
--- a/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenPropertyInitializerInClass.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-// "Create parameter 'foo'" "false"
-// ERROR: Unresolved reference: foo
-// ACTION: Create property 'foo'
-
-class A {
-    val <T> test: T = <caret>foo
-}
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenPropertyInitializerInGenClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenPropertyInitializerInGenClass.kt
deleted file mode 100644
index bd781b0ece7..00000000000
--- a/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenPropertyInitializerInGenClass.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-// "Create parameter 'foo'" "false"
-// ACTION: Create property 'foo'
-// ERROR: Unresolved reference: foo
-
-class A<T> {
-    val <T> test: T = <caret>foo
-}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
index 5e6e63b9495..1b606ece00d 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
@@ -2660,18 +2660,6 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
                     doTest(fileName);
                 }
 
-                @TestMetadata("inGenPropertyInitializerInClass.kt")
-                public void testInGenPropertyInitializerInClass() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenPropertyInitializerInClass.kt");
-                    doTest(fileName);
-                }
-
-                @TestMetadata("inGenPropertyInitializerInGenClass.kt")
-                public void testInGenPropertyInitializerInGenClass() throws Exception {
-                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenPropertyInitializerInGenClass.kt");
-                    doTest(fileName);
-                }
-
                 @TestMetadata("inLambdaNoParams.kt")
                 public void testInLambdaNoParams() throws Exception {
                     String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inLambdaNoParams.kt");
diff --git a/js/js.translator/testData/dataClass/cases/hashcode.kt b/js/js.translator/testData/dataClass/cases/hashcode.kt
index 005ed650834..42a7d6b7c66 100644
--- a/js/js.translator/testData/dataClass/cases/hashcode.kt
+++ b/js/js.translator/testData/dataClass/cases/hashcode.kt
@@ -32,7 +32,7 @@ fun assertAllEqual<T>(c: Iterable<out T>) {
 
 val hashCoder: (o: Any) -> Int = { o -> o.hashCode() }
 
-val <T> wrapInH = { t: T -> Holder(t) }
+fun <T> wrapInH(t: T) = Holder(t)
 
 fun box(): String {
 
@@ -53,14 +53,14 @@ fun box(): String {
     assertSomeNotEqual(differentOs.map(hashCoder))
 
     // Both Dat's and Obj's wrapped as Holder should retain their hashcode relations.
-    val sameHDs = sameDs.map(wrapInH)
+    val sameHDs = sameDs.map { wrapInH(it) }
     assertAllEqual(sameHDs.map(hashCoder))
-    val differentHDs = differentDs.map(wrapInH)
+    val differentHDs = differentDs.map { wrapInH(it) }
     assertSomeNotEqual(differentHDs.map(hashCoder))
 
-    val sameHOs = sameOs.map(wrapInH)
+    val sameHOs = sameOs.map { wrapInH(it) }
     assertSomeNotEqual(sameHOs.map(hashCoder))
-    val differentHOs = differentOs.map(wrapInH)
+    val differentHOs = differentOs.map { wrapInH(it) }
     assertSomeNotEqual(differentHOs.map(hashCoder))
 
     return "OK"