diff --git a/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObjectProperty.txt b/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObjectProperty.txt
index 3de45f89b1e..0a7fb6b9da9 100644
--- a/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObjectProperty.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleCompanionObjectProperty.txt
@@ -8,7 +8,7 @@ public final class A {
     public companion object Companion {
         private constructor Companion()
         @kotlin.jvm.JvmStatic public final val b: kotlin.String
-        public final var test.A.c: kotlin.String
+        @get:kotlin.jvm.JvmStatic @set:kotlin.jvm.JvmStatic public final var test.A.c: kotlin.String
     }
 }
 
diff --git a/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObjectProperty.txt b/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObjectProperty.txt
index cdc4a27a829..d34ec16e5eb 100644
--- a/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObjectProperty.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/jvmStatic/simpleObjectProperty.txt
@@ -5,7 +5,7 @@ public fun main(/*0*/ kotlin.Array<kotlin.String>): kotlin.Unit
 public object A {
     private constructor A()
     @kotlin.jvm.JvmStatic public final val b: kotlin.String
-    public final var test.A.c: kotlin.String
+    @get:kotlin.jvm.JvmStatic @set:kotlin.jvm.JvmStatic public final var test.A.c: kotlin.String
 }
 
 public/*package*/ open class Test {
diff --git a/compiler/testData/compileJavaAgainstKotlin/property/platformName/PlatformName.txt b/compiler/testData/compileJavaAgainstKotlin/property/platformName/PlatformName.txt
index 3c790e3341b..fb88b908692 100644
--- a/compiler/testData/compileJavaAgainstKotlin/property/platformName/PlatformName.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/property/platformName/PlatformName.txt
@@ -1,6 +1,6 @@
 package test
 
-public var v: kotlin.Int
+@get:kotlin.jvm.JvmName(name = "vget") @set:kotlin.jvm.JvmName(name = "vset") public var v: kotlin.Int
 
 public open class PlatformName {
     public constructor PlatformName()
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/accessors.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/accessors.txt
index fbee4dfdc87..dbe69424206 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/accessors.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/accessors.txt
@@ -2,7 +2,7 @@ package
 
 public final class My {
     public constructor My(/*0*/ x: kotlin.Int)
-    @smartget public final var y: kotlin.Int
+    @smartget @get:base @get:smartget @get:smartset @set:base @set:smartget @set:smartset public final var y: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     @base @smartget @smartset public final fun foo(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/java.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/java.txt
index c8d5a703728..92ffd8d6ff9 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/java.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/java.txt
@@ -75,7 +75,7 @@ package test {
     @test.AnnotationTargets.base @test.AnnotationTargets.meta @test.AnnotationTargets.type @test.AnnotationTargets.method @test.AnnotationTargets.multiple public final class KClass {
         @test.AnnotationTargets.base @test.AnnotationTargets.method @test.AnnotationTargets.konstructor public constructor KClass()
         public constructor KClass(/*0*/ @test.AnnotationTargets.base @test.AnnotationTargets.parameter y: @test.AnnotationTargets.base @test.AnnotationTargets.type kotlin.Int)
-        @test.AnnotationTargets.base @test.AnnotationTargets.local @field:test.AnnotationTargets.multiple @field:test.AnnotationTargets.fieldann public final val x: kotlin.Int = 0
+        @test.AnnotationTargets.base @test.AnnotationTargets.local @field:test.AnnotationTargets.multiple @field:test.AnnotationTargets.fieldann @get:test.AnnotationTargets.method @get:test.AnnotationTargets.konstructor @get:test.AnnotationTargets.type public final val x: kotlin.Int = 0
         @field:test.AnnotationTargets.fieldann public final val y: @test.AnnotationTargets.base @test.AnnotationTargets.type kotlin.Int
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         @test.AnnotationTargets.base @test.AnnotationTargets.method @test.AnnotationTargets.multiple @test.AnnotationTargets.konstructor public final fun foo(/*0*/ @test.AnnotationTargets.parameter @test.AnnotationTargets.type i: @test.AnnotationTargets.base @test.AnnotationTargets.multiple kotlin.Int): @test.AnnotationTargets.fieldann @test.AnnotationTargets.parameter kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/annotations/options/unrepeatable.txt b/compiler/testData/diagnostics/tests/annotations/options/unrepeatable.txt
index 45f8b96a441..6bed136abf4 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/unrepeatable.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/unrepeatable.txt
@@ -1,6 +1,6 @@
 package
 
-@unrepann(x = 0) public var annotated: kotlin.Int
+@unrepann(x = 0) @get:unrepann(x = 1) public var annotated: kotlin.Int
 @unrepann(x = 0) @unrepann(x = 1) public var annotated2: kotlin.Int
 @ann(y = 0) @ann(y = 1) public fun foo(/*0*/ @ann(y = 7) @ann(y = 2) x: kotlin.Int): kotlin.Int
 
diff --git a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/GetterAnnotations.txt b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/GetterAnnotations.txt
index 8280f1b00e2..2eb9a4d16d6 100644
--- a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/GetterAnnotations.txt
+++ b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/GetterAnnotations.txt
@@ -17,11 +17,11 @@ public final class CustomDelegate {
 
 @Ann public final class SomeClass {
     public constructor SomeClass()
-    protected final val delegatedProperty: kotlin.String
-    protected final var mutableProperty: kotlin.String
-    public final val propertyWithCustomGetter: kotlin.Int
-    protected final val simpleProperty: kotlin.String = "text"
-    protected final val simplePropertyWithAnnotationList: kotlin.String = "text"
+    @get:Ann protected final val delegatedProperty: kotlin.String
+    @get:Ann protected final var mutableProperty: kotlin.String
+    @get:Ann public final val propertyWithCustomGetter: kotlin.Int
+    @get:Ann protected final val simpleProperty: kotlin.String = "text"
+    @get:Ann protected final val simplePropertyWithAnnotationList: kotlin.String = "text"
     public final fun annotationOnFunction(/*0*/ a: kotlin.Int): kotlin.Int
     public final fun anotherFun(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SetterAnnotations.txt b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SetterAnnotations.txt
index fa1844352b4..4734dde585e 100644
--- a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SetterAnnotations.txt
+++ b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SetterAnnotations.txt
@@ -18,10 +18,10 @@ public final class CustomDelegate {
 
 @Ann public final class SomeClass {
     public constructor SomeClass()
-    protected final var delegatedProperty: kotlin.String
-    protected final var mutableProperty: kotlin.String
-    protected final var mutablePropertyWithAnnotationList: kotlin.String
-    public final var propertyWithCustomSetter: kotlin.Int
+    @set:Ann protected final var delegatedProperty: kotlin.String
+    @set:Ann protected final var mutableProperty: kotlin.String
+    @set:Ann protected final var mutablePropertyWithAnnotationList: kotlin.String
+    @set:Ann public final var propertyWithCustomSetter: kotlin.Int
     protected final val simpleProperty: kotlin.String = "text"
     public final fun annotationOnFunction(/*0*/ a: kotlin.Int): kotlin.Int
     public final fun anotherFun(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/repeatable.txt b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/repeatable.txt
index 288d9cc6352..64d49f45e38 100644
--- a/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/repeatable.txt
+++ b/compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/repeatable.txt
@@ -27,7 +27,7 @@ public final annotation class Ann : kotlin.Annotation {
 
 public final class B {
     public constructor B(/*0*/ @fieldOrPropAnn x: kotlin.Int, /*1*/ y: kotlin.Int)
-    @getSetAndParamAnn @setparam:getSetAndParamAnn public final var w: kotlin.Int
+    @getSetAndParamAnn @get:getSetAndParamAnn @set:getSetAndParamAnn @setparam:getSetAndParamAnn public final var w: kotlin.Int
     @fieldOrPropAnn public final val x: kotlin.Int
     @fieldOrPropAnn @fieldOrPropAnn public final val y: kotlin.Int
     @fieldOrPropAnn @field:fieldOrPropAnn public final val z: kotlin.Int = 42
diff --git a/compiler/testData/diagnostics/tests/deprecated/deprecatedPropertyInheritance.txt b/compiler/testData/diagnostics/tests/deprecated/deprecatedPropertyInheritance.txt
index 52b85367b65..61c069dcf0c 100644
--- a/compiler/testData/diagnostics/tests/deprecated/deprecatedPropertyInheritance.txt
+++ b/compiler/testData/diagnostics/tests/deprecated/deprecatedPropertyInheritance.txt
@@ -5,7 +5,7 @@ package foo {
 
     public final class Diff {
         public constructor Diff()
-        @kotlin.Deprecated(level = DeprecationLevel.WARNING, message = "") public final var p: kotlin.Int
+        @kotlin.Deprecated(level = DeprecationLevel.WARNING, message = "") @get:kotlin.Deprecated(level = DeprecationLevel.ERROR, message = "") @set:kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "") public final var p: 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
@@ -45,7 +45,7 @@ package foo {
 
     public open class GetterDeprecated {
         public constructor GetterDeprecated()
-        public open var p: kotlin.Int
+        @get:kotlin.Deprecated(message = "") public open var p: 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
@@ -91,7 +91,7 @@ package foo {
 
     public open class SetterDeprecated {
         public constructor SetterDeprecated()
-        public open var p: kotlin.Int
+        @set:kotlin.Deprecated(message = "") public open var p: 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/deprecated/hiddenPropertyAccessors.txt b/compiler/testData/diagnostics/tests/deprecated/hiddenPropertyAccessors.txt
index 93e61bab14d..ff222c023c9 100644
--- a/compiler/testData/diagnostics/tests/deprecated/hiddenPropertyAccessors.txt
+++ b/compiler/testData/diagnostics/tests/deprecated/hiddenPropertyAccessors.txt
@@ -1,9 +1,9 @@
 package
 
-public val v1: kotlin.String
+@get:kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "") public val v1: kotlin.String
 @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "") public val v2: kotlin.String = ""
-public var v3: kotlin.String
-public var v4: kotlin.String
-public var v5: kotlin.String
+@get:kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "") public var v3: kotlin.String
+@set:kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "") public var v4: kotlin.String
+@get:kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "") @set:kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "") public var v5: kotlin.String
 @kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "") public var v6: kotlin.String
 public fun test(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/deprecated/propertyUsage.txt b/compiler/testData/diagnostics/tests/deprecated/propertyUsage.txt
index 17681fe3030..fd390ffe26d 100644
--- a/compiler/testData/diagnostics/tests/deprecated/propertyUsage.txt
+++ b/compiler/testData/diagnostics/tests/deprecated/propertyUsage.txt
@@ -16,10 +16,10 @@ public final class Delegate {
 public final class PropertyHolder {
     public constructor PropertyHolder()
     @kotlin.Deprecated(message = "text") public final var name: kotlin.String
-    public final val test1: kotlin.String = ""
-    public final var test2: kotlin.String
-    public final var test3: kotlin.String
-    public final var test4: kotlin.String
+    @get:kotlin.Deprecated(message = "val-getter") public final val test1: kotlin.String = ""
+    @get:kotlin.Deprecated(message = "var-getter") @set:kotlin.Deprecated(message = "var-setter") public final var test2: kotlin.String
+    @get:kotlin.Deprecated(message = "var-getter") public final var test3: kotlin.String
+    @set:kotlin.Deprecated(message = "var-setter") public final var test4: kotlin.String
     public final val valDelegate: kotlin.Int
     public final var varDelegate: kotlin.Int
     @kotlin.Deprecated(message = "text") public final val x: kotlin.Int = 1
diff --git a/compiler/testData/diagnostics/tests/deprecated/propertyUseSiteTargetedAnnotations.txt b/compiler/testData/diagnostics/tests/deprecated/propertyUseSiteTargetedAnnotations.txt
index b285f275262..67dc98e44ba 100644
--- a/compiler/testData/diagnostics/tests/deprecated/propertyUseSiteTargetedAnnotations.txt
+++ b/compiler/testData/diagnostics/tests/deprecated/propertyUseSiteTargetedAnnotations.txt
@@ -7,8 +7,8 @@ public final class PropertyHolder {
     public constructor PropertyHolder()
     @kotlin.Deprecated(message = "") public final val a1: kotlin.Int = 1
     @kotlin.Deprecated(message = "") public final var a2: kotlin.String
-    public final val withGetter: kotlin.String = ""
-    public final var withSetter: kotlin.String
+    @get:kotlin.Deprecated(message = "") public final val withGetter: kotlin.String = ""
+    @set:kotlin.Deprecated(message = "") public final var withSetter: kotlin.String
     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/j+k/collectionOverrides/collectionStringImpl.txt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/collectionStringImpl.txt
index 146f79ede10..d2cd03f4501 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/collectionStringImpl.txt
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/collectionStringImpl.txt
@@ -4,7 +4,7 @@ public fun test(/*0*/ x: CollectionStringImpl): kotlin.Unit
 
 public open class CollectionStringImpl : kotlin.collections.MutableCollection<kotlin.String!> {
     public constructor CollectionStringImpl()
-    public open override /*1*/ val size: kotlin.Int
+    @get:java.lang.Override public open override /*1*/ val size: kotlin.Int
     @java.lang.Override public open override /*1*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
     @java.lang.Override public open override /*1*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     @java.lang.Override public open override /*1*/ fun clear(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.txt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.txt
index 0a4e517d0cd..3d96d47c10f 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.txt
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.txt
@@ -4,7 +4,7 @@ public fun main(): kotlin.Unit
 
 public open class X : kotlin.collections.MutableList<kotlin.String!> {
     public constructor X()
-    public open override /*1*/ val size: kotlin.Int
+    @get:java.lang.Override public open override /*1*/ val size: kotlin.Int
     @java.lang.Override public open override /*1*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
     @java.lang.Override public open override /*1*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
     @java.lang.Override public open override /*1*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
@@ -36,7 +36,7 @@ public open class X : kotlin.collections.MutableList<kotlin.String!> {
 
 public final class Y : X {
     public constructor Y()
-    public open override /*1*/ /*fake_override*/ val size: kotlin.Int
+    @get:java.lang.Override public open override /*1*/ /*fake_override*/ val size: kotlin.Int
     @java.lang.Override public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
     @java.lang.Override public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
     @java.lang.Override public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
@@ -68,7 +68,7 @@ public final class Y : X {
 
 public final class Y2 : X {
     public constructor Y2()
-    public open override /*1*/ /*fake_override*/ val size: kotlin.Int
+    @get:java.lang.Override public open override /*1*/ /*fake_override*/ val size: kotlin.Int
     @java.lang.Override public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
     @java.lang.Override public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
     @java.lang.Override public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/j+k/exceptionMessage.javac.txt b/compiler/testData/diagnostics/tests/j+k/exceptionMessage.javac.txt
index 675dc66dab6..8a019fbb9ae 100644
--- a/compiler/testData/diagnostics/tests/j+k/exceptionMessage.javac.txt
+++ b/compiler/testData/diagnostics/tests/j+k/exceptionMessage.javac.txt
@@ -6,7 +6,7 @@ public operator fun kotlin.CharSequence.contains(/*0*/ other: kotlin.CharSequenc
 public open class VcsException : java.lang.Exception {
     public constructor VcsException()
     public open override /*1*/ /*fake_override*/ val cause: kotlin.Throwable?
-    public open override /*1*/ val message: kotlin.String
+    @get:java.lang.Override @get:org.jetbrains.annotations.NotNull public open override /*1*/ val message: kotlin.String
     public final override /*1*/ /*fake_override*/ fun addSuppressed(/*0*/ p0: kotlin.Throwable!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun fillInStackTrace(): kotlin.Throwable!
diff --git a/compiler/testData/diagnostics/tests/j+k/exceptionMessage.txt b/compiler/testData/diagnostics/tests/j+k/exceptionMessage.txt
index b211938f6fe..49c5e931586 100644
--- a/compiler/testData/diagnostics/tests/j+k/exceptionMessage.txt
+++ b/compiler/testData/diagnostics/tests/j+k/exceptionMessage.txt
@@ -6,7 +6,7 @@ public operator fun kotlin.CharSequence.contains(/*0*/ other: kotlin.CharSequenc
 public open class VcsException : java.lang.Exception {
     public constructor VcsException()
     public open override /*1*/ /*fake_override*/ val cause: kotlin.Throwable?
-    public open override /*1*/ val message: kotlin.String
+    @get:java.lang.Override @get:org.jetbrains.annotations.NotNull public open override /*1*/ val message: kotlin.String
     public final override /*1*/ /*fake_override*/ fun addSuppressed(/*0*/ exception: kotlin.Throwable!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun fillInStackTrace(): kotlin.Throwable!
diff --git a/compiler/testData/diagnostics/tests/j+k/kt1730_implementCharSequence.txt b/compiler/testData/diagnostics/tests/j+k/kt1730_implementCharSequence.txt
index c188c1d7554..b8d63d00f59 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt1730_implementCharSequence.txt
+++ b/compiler/testData/diagnostics/tests/j+k/kt1730_implementCharSequence.txt
@@ -2,7 +2,7 @@ package
 
 public open class C : kotlin.CharSequence {
     public constructor C()
-    public open override /*1*/ val length: kotlin.Int
+    @get:java.lang.Override public open override /*1*/ val length: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     @java.lang.Override public open override /*1*/ fun get(/*0*/ index: kotlin.Int): kotlin.Char
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -12,7 +12,7 @@ public open class C : kotlin.CharSequence {
 
 public final class T : C {
     public constructor T()
-    public open override /*1*/ /*fake_override*/ val length: kotlin.Int
+    @get:java.lang.Override public open override /*1*/ /*fake_override*/ val length: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     @java.lang.Override public open override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.Char
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/j+k/primitiveOverrides/specializedMap.txt b/compiler/testData/diagnostics/tests/j+k/primitiveOverrides/specializedMap.txt
index 807562d748a..fc6ea375f3f 100644
--- a/compiler/testData/diagnostics/tests/j+k/primitiveOverrides/specializedMap.txt
+++ b/compiler/testData/diagnostics/tests/j+k/primitiveOverrides/specializedMap.txt
@@ -28,10 +28,10 @@ public abstract class AbstractSpecializedMap : kotlin.collections.MutableMap<kot
 
 public open class SpecializedMap : AbstractSpecializedMap {
     public constructor SpecializedMap()
-    public open override /*1*/ val entries: kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<kotlin.Int!, kotlin.Double!>>
-    public open override /*1*/ val keys: kotlin.collections.MutableSet<kotlin.Int!>
-    public open override /*1*/ val size: kotlin.Int
-    public open override /*1*/ val values: kotlin.collections.MutableCollection<kotlin.Double!>
+    @get:org.jetbrains.annotations.NotNull @get:java.lang.Override public open override /*1*/ val entries: kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<kotlin.Int!, kotlin.Double!>>
+    @get:org.jetbrains.annotations.NotNull @get:java.lang.Override public open override /*1*/ val keys: kotlin.collections.MutableSet<kotlin.Int!>
+    @get:java.lang.Override public open override /*1*/ val size: kotlin.Int
+    @get:org.jetbrains.annotations.NotNull @get:java.lang.Override public open override /*1*/ val values: kotlin.collections.MutableCollection<kotlin.Double!>
     @java.lang.Override public open override /*1*/ fun clear(): kotlin.Unit
     public open override /*1*/ fun containsKey(/*0*/ k: kotlin.Int): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun containsKey(/*0*/ x: kotlin.Int!): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.javac.txt b/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.javac.txt
index 05295e0be07..3352c0aef6b 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.javac.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.javac.txt
@@ -4,7 +4,7 @@ public fun </*0*/ M2 : WithFoo> foo(/*0*/ delegateResolver: ResolverForProject<M
 
 public/*package*/ open class MyMap</*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!> : java.util.AbstractMap<K!, V!> {
     public/*package*/ constructor MyMap</*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!>()
-    public open override /*1*/ val entries: kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<K!, V!>>
+    @get:java.lang.Override public open override /*1*/ val entries: kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<K!, V!>>
     invisible_fake final override /*1*/ /*fake_override*/ var keySet: kotlin.collections.(Mutable)Set<K!>!
     public open override /*1*/ /*fake_override*/ val keys: kotlin.collections.MutableSet<K!>
     public open override /*1*/ /*fake_override*/ val size: kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.txt b/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.txt
index d53d688fbd9..f8b857d40a9 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.txt
@@ -4,7 +4,7 @@ public fun </*0*/ M2 : WithFoo> foo(/*0*/ delegateResolver: ResolverForProject<M
 
 public/*package*/ open class MyMap</*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!> : java.util.AbstractMap<K!, V!> {
     public/*package*/ constructor MyMap</*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!>()
-    public open override /*1*/ val entries: kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<K!, V!>>
+    @get:java.lang.Override public open override /*1*/ val entries: kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<K!, V!>>
     invisible_fake final override /*1*/ /*fake_override*/ var keySet: kotlin.collections.(Mutable)Set<K!>!
     public open override /*1*/ /*fake_override*/ val keys: kotlin.collections.MutableSet<K!>
     public open override /*1*/ /*fake_override*/ val size: kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/propertyAccessors.txt b/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/propertyAccessors.txt
index e6481973f12..a9b9d001e59 100644
--- a/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/propertyAccessors.txt
+++ b/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/propertyAccessors.txt
@@ -1,10 +1,10 @@
 package
 
-public val v1: kotlin.String
+@get:kotlin.SinceKotlin(version = "1.1") public val v1: kotlin.String
 @kotlin.SinceKotlin(version = "1.1") public val v2: kotlin.String = ""
-public var v3: kotlin.String
-public var v4: kotlin.String
-public var v5: kotlin.String
+@get:kotlin.SinceKotlin(version = "1.1") public var v3: kotlin.String
+@set:kotlin.SinceKotlin(version = "1.1") public var v4: kotlin.String
+@get:kotlin.SinceKotlin(version = "1.1") @set:kotlin.SinceKotlin(version = "1.1") public var v5: kotlin.String
 @kotlin.SinceKotlin(version = "1.1") public var v6: kotlin.String
-@kotlin.SinceKotlin(version = "1.0") public val v7: kotlin.String
+@kotlin.SinceKotlin(version = "1.0") @get:kotlin.SinceKotlin(version = "1.1") public val v7: kotlin.String
 public fun test(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnPropertyAccessor.txt b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnPropertyAccessor.txt
index 6a9c50f0c5f..beef6faa11d 100644
--- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnPropertyAccessor.txt
+++ b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnPropertyAccessor.txt
@@ -2,7 +2,7 @@ package
 
 public final class C {
     public constructor C()
-    public final val foo: kotlin.String?
+    @get:kotlin.Suppress(names = {"warnings"}) public final val foo: kotlin.String?
     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/suppress/manyWarnings/onPropertyAccessor.txt b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onPropertyAccessor.txt
index 6a9c50f0c5f..7640f9a02e2 100644
--- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onPropertyAccessor.txt
+++ b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onPropertyAccessor.txt
@@ -2,7 +2,7 @@ package
 
 public final class C {
     public constructor C()
-    public final val foo: kotlin.String?
+    @get:kotlin.Suppress(names = {"REDUNDANT_NULLABLE", "UNNECESSARY_NOT_NULL_ASSERTION"}) public final val foo: kotlin.String?
     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/suppress/oneWarning/onPropertyAccessor.txt b/compiler/testData/diagnostics/tests/suppress/oneWarning/onPropertyAccessor.txt
index 6a9c50f0c5f..d244f3cde68 100644
--- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onPropertyAccessor.txt
+++ b/compiler/testData/diagnostics/tests/suppress/oneWarning/onPropertyAccessor.txt
@@ -2,7 +2,7 @@ package
 
 public final class C {
     public constructor C()
-    public final val foo: kotlin.String?
+    @get:kotlin.Suppress(names = {"REDUNDANT_NULLABLE"}) public final val foo: kotlin.String?
     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/name/illegalName.txt b/compiler/testData/diagnostics/testsWithJsStdLib/name/illegalName.txt
index e546680d26a..7edacbd3d25 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/name/illegalName.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/name/illegalName.txt
@@ -1,6 +1,6 @@
 package
 
-public val x: kotlin.Int
+@get:kotlin.js.JsName(name = ".") public val x: kotlin.Int
 private fun ` .private `(): kotlin.String
 @kotlin.js.JsName(name = "validName") private fun ` .private with @JsName `(): kotlin.String
 public fun ` .public `(): kotlin.String
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameMissingOnAccessors.txt b/compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameMissingOnAccessors.txt
index 7568892f2eb..d044655884b 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameMissingOnAccessors.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameMissingOnAccessors.txt
@@ -1,14 +1,14 @@
 package
 
 package foo {
-    public var xx: kotlin.Int
-    public var foo.A.ext: kotlin.Int
+    @get:kotlin.js.JsName(name = "get_xx") public var xx: kotlin.Int
+    @get:kotlin.js.JsName(name = "get_ext") public var foo.A.ext: kotlin.Int
 
     public final class A {
         public constructor A()
-        public final var x: kotlin.Int
-        public final var y: kotlin.Int
-        public final var z: kotlin.Int
+        @get:kotlin.js.JsName(name = "get_x") public final var x: kotlin.Int
+        @set:kotlin.js.JsName(name = "set_y") public final var y: kotlin.Int
+        @get:kotlin.js.JsName(name = "get_z") @set:kotlin.js.JsName(name = "set_z") public final var z: 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/name/jsNameOnAccessors.txt b/compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameOnAccessors.txt
index 46b29371631..57c5d920d92 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameOnAccessors.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameOnAccessors.txt
@@ -4,7 +4,7 @@ package foo {
 
     public final class A {
         public constructor A()
-        public final var x: kotlin.Int
+        @get:kotlin.js.JsName(name = "xx") @set:kotlin.js.JsName(name = "xx") public final var x: 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/name/jsNameOnOverride.txt b/compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameOnOverride.txt
index 08c17f8daf4..d6081603f32 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameOnOverride.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameOnOverride.txt
@@ -5,7 +5,7 @@ package foo {
     public open class A {
         public constructor A()
         @kotlin.js.JsName(name = "bar_") public open val bar: kotlin.Int = 123
-        public open val baz: kotlin.Int
+        @get:kotlin.js.JsName(name = "getBaz_") public open val baz: kotlin.Int
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         @kotlin.js.JsName(name = "foo_") public open fun foo(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -15,7 +15,7 @@ package foo {
     public final class B : foo.A {
         public constructor B()
         @kotlin.js.JsName(name = "bar__") public open override /*1*/ val bar: kotlin.Int = 142
-        public open override /*1*/ val baz: kotlin.Int
+        @get:kotlin.js.JsName(name = "getBaz__") public open override /*1*/ val baz: kotlin.Int
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         @kotlin.js.JsName(name = "foo__") public open override /*1*/ fun foo(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameOnPropertyAndAccessor.txt b/compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameOnPropertyAndAccessor.txt
index 43003848b1d..230a5d4ad0b 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameOnPropertyAndAccessor.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameOnPropertyAndAccessor.txt
@@ -1,14 +1,14 @@
 package
 
 package foo {
-    @kotlin.js.JsName(name = "mm_") public var mm: kotlin.Int
-    @kotlin.js.JsName(name = "xx_") public val xx: kotlin.Int
+    @kotlin.js.JsName(name = "mm_") @get:kotlin.js.JsName(name = "get_mm") @set:kotlin.js.JsName(name = "set_mm") public var mm: kotlin.Int
+    @kotlin.js.JsName(name = "xx_") @get:kotlin.js.JsName(name = "get_xx") public val xx: kotlin.Int
     @kotlin.js.JsName(name = "yy_") public val yy: kotlin.Int = 0
 
     public final class A {
         public constructor A()
-        @kotlin.js.JsName(name = "m_") public final var m: kotlin.Int
-        @kotlin.js.JsName(name = "x_") public final val x: kotlin.Int
+        @kotlin.js.JsName(name = "m_") @get:kotlin.js.JsName(name = "get_m") @set:kotlin.js.JsName(name = "set_m") public final var m: kotlin.Int
+        @kotlin.js.JsName(name = "x_") @get:kotlin.js.JsName(name = "get_x") public final val x: kotlin.Int
         @kotlin.js.JsName(name = "y_") public final val y: kotlin.Int = 0
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameUseTargetOnProperty.txt b/compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameUseTargetOnProperty.txt
index 05e34586e25..4a832294e47 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameUseTargetOnProperty.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/name/jsNameUseTargetOnProperty.txt
@@ -2,8 +2,8 @@ package
 
 public final class A {
     public constructor A()
-    @kotlin.js.JsName(name = "x_") public final val x: kotlin.Int = 0
-    public final var y: kotlin.Int
+    @kotlin.js.JsName(name = "x_") @get:kotlin.js.JsName(name = "getX_") public final val x: kotlin.Int = 0
+    @get:kotlin.js.JsName(name = "getY_") public final var y: 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/runtimeAnnotations.txt b/compiler/testData/diagnostics/testsWithJsStdLib/runtimeAnnotations.txt
index 1e84e184978..a0f5360d471 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/runtimeAnnotations.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/runtimeAnnotations.txt
@@ -3,7 +3,7 @@ package
 @X public final external class A {
     public constructor A()
     @X public final val p: kotlin.Int
-    public final val r: kotlin.Int
+    @get:X public final val r: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     @X public final fun f(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -13,7 +13,7 @@ package
 @Y public final external class B {
     public constructor B()
     @Y public final val p: kotlin.Int
-    public final val r: kotlin.Int
+    @get:Y public final val r: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     @Y public final fun f(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -23,8 +23,8 @@ package
 @X public final class C {
     public constructor C()
     @X public final val p: kotlin.Int = 0
-    public final val q: kotlin.Int
-    public final val r: kotlin.Int = 0
+    @get:X public final val q: kotlin.Int
+    @get:X public final val r: kotlin.Int = 0
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     @X public final fun f(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -34,8 +34,8 @@ package
 @Y public final class D {
     public constructor D()
     @Y public final val p: kotlin.Int = 0
-    public final val q: kotlin.Int
-    public final val r: kotlin.Int = 0
+    @get:Y public final val q: kotlin.Int
+    @get:Y public final val r: kotlin.Int = 0
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     @Y public final fun f(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/JvmSyntheticOnDelegate.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/JvmSyntheticOnDelegate.txt
index 9699ef46418..e2f589c06e8 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/JvmSyntheticOnDelegate.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/JvmSyntheticOnDelegate.txt
@@ -3,8 +3,8 @@ package
 public final class My {
     public constructor My()
     @delegate:kotlin.jvm.JvmSynthetic public final val s: kotlin.String
-    public final val t: kotlin.String
-    public final var z: kotlin.String
+    @get:kotlin.jvm.JvmSynthetic public final val t: kotlin.String
+    @set:kotlin.jvm.JvmSynthetic public final var z: kotlin.String
     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/testsWithStdLib/annotations/annotationApplicability/annotationsOnUseSiteTargets.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/annotationsOnUseSiteTargets.txt
index 32510493af4..b21ad07aa30 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/annotationsOnUseSiteTargets.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/annotationsOnUseSiteTargets.txt
@@ -1,10 +1,10 @@
 package
 
 public interface Test {
-    public abstract val a: kotlin.Int
-    public abstract val b: kotlin.Int
-    public abstract val c: kotlin.Int
-    public abstract val d: kotlin.Int
+    @get:kotlin.jvm.JvmStatic public abstract val a: kotlin.Int
+    @get:kotlin.jvm.JvmName(name = "1") public abstract val b: kotlin.Int
+    @get:kotlin.jvm.Synchronized public abstract val c: kotlin.Int
+    @get:kotlin.jvm.JvmOverloads public abstract val d: 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/testsWithStdLib/annotations/annotationApplicability/jvmName.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/jvmName.txt
index 15b8600d5b9..200188f2c0a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/jvmName.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/jvmName.txt
@@ -1,9 +1,9 @@
 package
 
 @kotlin.jvm.JvmName(name = "c") public val px: kotlin.Int = 1
-public val valx: kotlin.Int
-public var vardef: kotlin.Int
-public var varx: kotlin.Int
+@get:kotlin.jvm.JvmName(name = "e") public val valx: kotlin.Int
+@get:kotlin.jvm.JvmName(name = "h") @set:kotlin.jvm.JvmName(name = "i") public var vardef: kotlin.Int
+@get:kotlin.jvm.JvmName(name = "f") @set:kotlin.jvm.JvmName(name = "g") public var varx: kotlin.Int
 @kotlin.jvm.JvmName(name = "d") public val kotlin.Any.px: kotlin.Int
 @kotlin.jvm.JvmName(name = "a") public fun foo(): kotlin.Unit
 public fun foo1(): kotlin.Unit
@@ -23,8 +23,8 @@ public abstract class AB {
     @kotlin.jvm.JvmName(name = "primary") public constructor C()
     @kotlin.jvm.JvmName(name = "ctr") public constructor C(/*0*/ x: kotlin.Int)
     @kotlin.jvm.JvmName(name = "c") public final val px: kotlin.Int = 1
-    public final val valx: kotlin.Int
-    public final var varx: kotlin.Int
+    @get:kotlin.jvm.JvmName(name = "e") public final val valx: kotlin.Int
+    @get:kotlin.jvm.JvmName(name = "f") @set:kotlin.jvm.JvmName(name = "g") public final var varx: kotlin.Int
     @kotlin.jvm.JvmName(name = "d") public final val kotlin.Any.px: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     @kotlin.jvm.JvmName(name = "a") public final fun foo(): kotlin.Unit
@@ -45,7 +45,7 @@ public final class D : AB {
 }
 
 public interface Intf {
-    public abstract var foo: kotlin.Int
+    @get:kotlin.jvm.JvmName(name = "getBar") @set:kotlin.jvm.JvmName(name = "setBar") public abstract var foo: 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/testsWithStdLib/annotations/annotationsTargetingNonExistentAccessor.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsTargetingNonExistentAccessor.txt
index 3cdc0a361c1..917b9b20c7f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsTargetingNonExistentAccessor.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationsTargetingNonExistentAccessor.txt
@@ -24,16 +24,16 @@ public final class CustomDelegate {
 
 private final class EffetivelyPrivate {
     private constructor EffetivelyPrivate(/*0*/ x0: kotlin.Int, /*1*/ x1: kotlin.Int, /*2*/ x2: kotlin.Int)
-    public final val x0: kotlin.Int
-    protected final val x1: kotlin.Int
-    internal final val x2: kotlin.Int
+    @get:Ann public final val x0: kotlin.Int
+    @get:Ann protected final val x1: kotlin.Int
+    @get:Ann internal final val x2: 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
 
     private final class Nested {
         public constructor Nested()
-        public final val fofo: kotlin.Int = 0
+        @get:Ann public final val fofo: kotlin.Int = 0
         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
@@ -42,17 +42,17 @@ private final class EffetivelyPrivate {
 
 public final class Foo {
     public constructor Foo(/*0*/ y0: kotlin.Int, /*1*/ vararg y1: kotlin.String /*kotlin.Array<out kotlin.String>*/)
-    private final val x1: kotlin.String = ""
-    private final var x2: kotlin.String
+    @get:Ann private final val x1: kotlin.String = ""
+    @set:Ann private final var x2: kotlin.String
     @setparam:Ann private final var x3: kotlin.String
     @setparam:Ann @setparam:AnnRepeat private final var x4: kotlin.String
-    internal final val x5: kotlin.String = ""
-    protected final val x6: kotlin.String = ""
-    private final val x7: kotlin.String = ""
-    private final var x8: kotlin.String
-    private final var x9: kotlin.String
-    private final val y0: kotlin.Int
-    private final val y1: kotlin.Array<out kotlin.String>
+    @get:Ann internal final val x5: kotlin.String = ""
+    @get:Ann protected final val x6: kotlin.String = ""
+    @get:Ann @get:AnnRepeat private final val x7: kotlin.String = ""
+    @get:Ann @set:Ann private final var x8: kotlin.String
+    @get:Ann @set:Ann private final var x9: kotlin.String
+    @get:Ann private final val y0: kotlin.Int
+    @get:Ann private final val y1: kotlin.Array<out kotlin.String>
     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
@@ -60,7 +60,7 @@ public final class Foo {
 
 private final class Other {
     public constructor Other(/*0*/ @Ann param: kotlin.Int)
-    @delegate:Ann private final val delegate: kotlin.String
+    @delegate:Ann @get:Ann private final val delegate: kotlin.String
     @Ann @field:Ann private final val other: kotlin.String = ""
     private final val param: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -71,7 +71,7 @@ private final class Other {
 
 public final class PrivateToThis</*0*/ in I> {
     public constructor PrivateToThis</*0*/ in I>()
-    @setparam:Ann private/*private to this*/ final var x0: I
+    @get:Ann @set:Ann @setparam:Ann private/*private to this*/ final var x0: I
     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
@@ -86,19 +86,19 @@ public final class PrivateToThis</*0*/ in I> {
 
 public final class Statics {
     public constructor Statics()
-    public final lateinit var y0: kotlin.String
-    private final lateinit var y1: kotlin.String
+    @get:Ann public final lateinit var y0: kotlin.String
+    @get:Ann private final lateinit var y1: kotlin.String
     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
 
     public companion object Companion {
         private constructor Companion()
-        @field:kotlin.jvm.JvmField public final val x0: kotlin.String = ""
-        public const final val x1: kotlin.String = ""
-        @kotlin.jvm.JvmStatic public final val x2: kotlin.String = ""
-        @kotlin.jvm.JvmStatic private final val x3: kotlin.String = ""
-        @kotlin.jvm.JvmStatic private final val x4: kotlin.String = ""
+        @field:kotlin.jvm.JvmField @get:Ann public final val x0: kotlin.String = ""
+        @get:Ann public const final val x1: kotlin.String = ""
+        @kotlin.jvm.JvmStatic @get:Ann public final val x2: kotlin.String = ""
+        @kotlin.jvm.JvmStatic @get:Ann private final val x3: kotlin.String = ""
+        @kotlin.jvm.JvmStatic @get:Ann private final val x4: kotlin.String = ""
         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
@@ -107,8 +107,8 @@ public final class Statics {
 
 public final class WithSource {
     public constructor WithSource()
-    @setparam:SourceAnn private final var x0: kotlin.String
-    private final val x1: kotlin.String = ""
+    @get:SourceAnn @set:SourceAnn @setparam:SourceAnn private final var x0: kotlin.String
+    @get:SourceAnn private final val x1: kotlin.String = ""
     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/testsWithStdLib/annotations/jvmDefault/propertyAccessor.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.txt
index 8a8cfa86a23..b4aafc9ca9b 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.txt
@@ -1,8 +1,8 @@
 package
 
 public interface B {
-    @kotlin.jvm.JvmDefault public open val prop1: kotlin.String
-    public open var prop2: kotlin.String
+    @kotlin.jvm.JvmDefault @get:kotlin.jvm.JvmDefault public open val prop1: kotlin.String
+    @get:kotlin.jvm.JvmDefault @set:kotlin.jvm.JvmDefault public open var prop2: kotlin.String
     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/testsWithStdLib/annotations/jvmField/jvmFieldApplicability.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/jvmFieldApplicability.txt
index 95857d5cd44..7437e96135e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/jvmFieldApplicability.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/jvmFieldApplicability.txt
@@ -14,8 +14,8 @@ package
     @kotlin.jvm.JvmField public abstract val c: kotlin.Int
     @field:kotlin.jvm.JvmField public final val customGetter: kotlin.String = ""
     @field:kotlin.jvm.JvmField public final var customSetter: kotlin.String
-    @field:kotlin.jvm.JvmField public final val explicitDefaultAnnotatedGetter: kotlin.String = ""
-    @field:kotlin.jvm.JvmField public final var explicitDefaultAnnotatedSetter: kotlin.String
+    @field:kotlin.jvm.JvmField @get:DemoAnnotation public final val explicitDefaultAnnotatedGetter: kotlin.String = ""
+    @field:kotlin.jvm.JvmField @set:DemoAnnotation public final var explicitDefaultAnnotatedSetter: kotlin.String
     @field:kotlin.jvm.JvmField public final val explicitDefaultGetter: kotlin.String = ""
     @field:kotlin.jvm.JvmField public final var explicitDefaultSetter: kotlin.String
     @kotlin.jvm.JvmField public final val noBackingField: kotlin.String
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL12.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL12.txt
index e8ed47c552b..62ed049e764 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL12.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL12.txt
@@ -14,9 +14,9 @@ public interface B {
         @kotlin.jvm.JvmStatic protected final var foo4: kotlin.Int
         @kotlin.jvm.JvmStatic protected final var foo5: kotlin.Int
         @kotlin.jvm.JvmStatic public final val foo6: kotlin.Int = 1
-        public final val foo7: kotlin.Int = 1
-        private final var foo8: kotlin.Int
-        public final var foo9: kotlin.Int
+        @get:kotlin.jvm.JvmStatic public final val foo7: kotlin.Int = 1
+        @set:kotlin.jvm.JvmStatic private final var foo8: kotlin.Int
+        @set:kotlin.jvm.JvmStatic public final var foo9: kotlin.Int
         @kotlin.jvm.JvmStatic public final fun a1(): kotlin.Unit
         @kotlin.jvm.JvmStatic private final fun a2(): kotlin.Unit
         @kotlin.jvm.JvmStatic protected final fun a3(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL13_16.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL13_16.txt
index e8ed47c552b..62ed049e764 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL13_16.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL13_16.txt
@@ -14,9 +14,9 @@ public interface B {
         @kotlin.jvm.JvmStatic protected final var foo4: kotlin.Int
         @kotlin.jvm.JvmStatic protected final var foo5: kotlin.Int
         @kotlin.jvm.JvmStatic public final val foo6: kotlin.Int = 1
-        public final val foo7: kotlin.Int = 1
-        private final var foo8: kotlin.Int
-        public final var foo9: kotlin.Int
+        @get:kotlin.jvm.JvmStatic public final val foo7: kotlin.Int = 1
+        @set:kotlin.jvm.JvmStatic private final var foo8: kotlin.Int
+        @set:kotlin.jvm.JvmStatic public final var foo9: kotlin.Int
         @kotlin.jvm.JvmStatic public final fun a1(): kotlin.Unit
         @kotlin.jvm.JvmStatic private final fun a2(): kotlin.Unit
         @kotlin.jvm.JvmStatic protected final fun a3(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL13_18.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL13_18.txt
index e8ed47c552b..62ed049e764 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL13_18.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/interfaceCompanion_LL13_18.txt
@@ -14,9 +14,9 @@ public interface B {
         @kotlin.jvm.JvmStatic protected final var foo4: kotlin.Int
         @kotlin.jvm.JvmStatic protected final var foo5: kotlin.Int
         @kotlin.jvm.JvmStatic public final val foo6: kotlin.Int = 1
-        public final val foo7: kotlin.Int = 1
-        private final var foo8: kotlin.Int
-        public final var foo9: kotlin.Int
+        @get:kotlin.jvm.JvmStatic public final val foo7: kotlin.Int = 1
+        @set:kotlin.jvm.JvmStatic private final var foo8: kotlin.Int
+        @set:kotlin.jvm.JvmStatic public final var foo9: kotlin.Int
         @kotlin.jvm.JvmStatic public final fun a1(): kotlin.Unit
         @kotlin.jvm.JvmStatic private final fun a2(): kotlin.Unit
         @kotlin.jvm.JvmStatic protected final fun a3(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property.txt
index 2c28ded48cc..6141e8668b8 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property.txt
@@ -2,7 +2,7 @@ package
 
 public final class A {
     public constructor A()
-    public final var p: kotlin.Int
+    @set:kotlin.jvm.JvmStatic public final var p: kotlin.Int
     @kotlin.jvm.JvmStatic public final val z2: kotlin.Int = 1
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -11,8 +11,8 @@ public final class A {
     public object A : B {
         private constructor A()
         @kotlin.jvm.JvmStatic public open override /*1*/ val base1: kotlin.Int = 0
-        public open override /*1*/ val base2: kotlin.Int = 0
-        public final var p: kotlin.Int
+        @get:kotlin.jvm.JvmStatic public open override /*1*/ val base2: kotlin.Int = 0
+        @set:kotlin.jvm.JvmStatic public final var p: kotlin.Int
         @kotlin.jvm.JvmStatic public final val z: kotlin.Int = 1
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         @kotlin.jvm.JvmStatic public open fun f(): kotlin.Unit
@@ -23,8 +23,8 @@ public final class A {
     public companion object Companion : B {
         private constructor Companion()
         @kotlin.jvm.JvmStatic public open override /*1*/ val base1: kotlin.Int = 0
-        public open override /*1*/ val base2: kotlin.Int = 0
-        public final var p1: kotlin.Int
+        @get:kotlin.jvm.JvmStatic public open override /*1*/ val base2: kotlin.Int = 0
+        @set:kotlin.jvm.JvmStatic public final var p1: kotlin.Int
         @kotlin.jvm.JvmStatic public final val z: kotlin.Int = 1
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property_LL13.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property_LL13.txt
index 2c28ded48cc..6141e8668b8 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property_LL13.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmStatic/property_LL13.txt
@@ -2,7 +2,7 @@ package
 
 public final class A {
     public constructor A()
-    public final var p: kotlin.Int
+    @set:kotlin.jvm.JvmStatic public final var p: kotlin.Int
     @kotlin.jvm.JvmStatic public final val z2: kotlin.Int = 1
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -11,8 +11,8 @@ public final class A {
     public object A : B {
         private constructor A()
         @kotlin.jvm.JvmStatic public open override /*1*/ val base1: kotlin.Int = 0
-        public open override /*1*/ val base2: kotlin.Int = 0
-        public final var p: kotlin.Int
+        @get:kotlin.jvm.JvmStatic public open override /*1*/ val base2: kotlin.Int = 0
+        @set:kotlin.jvm.JvmStatic public final var p: kotlin.Int
         @kotlin.jvm.JvmStatic public final val z: kotlin.Int = 1
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         @kotlin.jvm.JvmStatic public open fun f(): kotlin.Unit
@@ -23,8 +23,8 @@ public final class A {
     public companion object Companion : B {
         private constructor Companion()
         @kotlin.jvm.JvmStatic public open override /*1*/ val base1: kotlin.Int = 0
-        public open override /*1*/ val base2: kotlin.Int = 0
-        public final var p1: kotlin.Int
+        @get:kotlin.jvm.JvmStatic public open override /*1*/ val base2: kotlin.Int = 0
+        @set:kotlin.jvm.JvmStatic public final var p1: kotlin.Int
         @kotlin.jvm.JvmStatic public final val z: kotlin.Int = 1
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmNames.txt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmNames.txt
index 87550b42470..31592c42d14 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmNames.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmNames.txt
@@ -7,7 +7,7 @@ public fun kotlin.Any.foo(): kotlin.Unit
 
 public final class C {
     public constructor C()
-    public final var rwProp: kotlin.Int
+    @get:kotlin.jvm.JvmName(name = "get_rwProp") @set:kotlin.jvm.JvmName(name = "set_rwProp") public final var rwProp: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final fun getRwProp(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/testsWithStdLib/experimental/annotation.txt b/compiler/testData/diagnostics/testsWithStdLib/experimental/annotation.txt
index 9622fde9182..2cd816dd88c 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/experimental/annotation.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/experimental/annotation.txt
@@ -47,7 +47,7 @@ package usage1 {
 
 package usage2 {
     @kotlin.UseExperimental(markerClass = {api.ExperimentalAPI::class}) public val inProperty: () -> kotlin.Unit
-    public val inPropertyAccessor: () -> kotlin.Unit
+    @get:kotlin.UseExperimental(markerClass = {api.ExperimentalAPI::class}) public val inPropertyAccessor: () -> kotlin.Unit
     @kotlin.UseExperimental(markerClass = {api.ExperimentalAPI::class}) @api.EAnno public val property: kotlin.String = ""
     @kotlin.UseExperimental(markerClass = {api.ExperimentalAPI::class}) @api.EAnno public fun function(): kotlin.Unit
     public fun inDefaultArgument(/*0*/ @kotlin.UseExperimental(markerClass = {api.ExperimentalAPI::class}) f: () -> kotlin.Unit = ...): kotlin.Unit
diff --git a/compiler/testData/diagnostics/testsWithStdLib/experimental/bodyUsagesAndInline.txt b/compiler/testData/diagnostics/testsWithStdLib/experimental/bodyUsagesAndInline.txt
index a2ea8b6b93f..dbe8624350a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/experimental/bodyUsagesAndInline.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/experimental/bodyUsagesAndInline.txt
@@ -13,7 +13,7 @@ package api {
 
 package usage {
     public var inlineUse2: kotlin.Unit
-    public var inlineUse3: kotlin.Unit
+    @set:api.API public var inlineUse3: kotlin.Unit
     private var privateInline3: kotlin.Unit
     public val use2: kotlin.Unit
     public inline fun inlineUse1(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/testsWithStdLib/experimental/useExperimentalTargets.txt b/compiler/testData/diagnostics/testsWithStdLib/experimental/useExperimentalTargets.txt
index 9791dca39e2..56c37641905 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/experimental/useExperimentalTargets.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/experimental/useExperimentalTargets.txt
@@ -1,7 +1,7 @@
 package
 
 @kotlin.UseExperimental(markerClass = {api.E::class}) public val property: kotlin.String
-public var propertyAccessors: kotlin.String
+@get:kotlin.UseExperimental(markerClass = {api.E::class}) @set:kotlin.UseExperimental(markerClass = {api.E::class}) public var propertyAccessors: kotlin.String
 public fun expression(): kotlin.String
 @kotlin.UseExperimental(markerClass = {api.E::class}) public fun function(): kotlin.Unit
 public fun valueParameter(/*0*/ @kotlin.UseExperimental(markerClass = {api.E::class}) p: kotlin.String = ...): kotlin.String
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.javac.txt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.javac.txt
index 067be5f8238..0a9c68ed5d8 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.javac.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.javac.txt
@@ -5,7 +5,7 @@ public fun foo(): kotlin.Unit
 
 @kotlin.jvm.PurelyImplements(value = "kotlin.collections.MutableCollection") public/*package*/ open class A</*0*/ T : kotlin.Any!> : java.util.AbstractCollection<T!>, kotlin.collections.MutableCollection<T> {
     public/*package*/ constructor A</*0*/ T : kotlin.Any!>()
-    public open override /*2*/ val size: kotlin.Int
+    @get:java.lang.Override public open override /*2*/ val size: kotlin.Int
     public open override /*2*/ /*fake_override*/ fun add(/*0*/ element: T): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<T>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun clear(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.txt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.txt
index 28370cce5e9..6f71c17abae 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.txt
@@ -5,7 +5,7 @@ public fun foo(): kotlin.Unit
 
 @kotlin.jvm.PurelyImplements(value = "kotlin.collections.MutableCollection") public/*package*/ open class A</*0*/ T : kotlin.Any!> : java.util.AbstractCollection<T!>, kotlin.collections.MutableCollection<T> {
     public/*package*/ constructor A</*0*/ T : kotlin.Any!>()
-    public open override /*2*/ val size: kotlin.Int
+    @get:java.lang.Override public open override /*2*/ val size: kotlin.Int
     public open override /*2*/ /*fake_override*/ fun add(/*0*/ element: T): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<T>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun clear(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.javac.txt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.javac.txt
index f9b05ee1b9a..31f9bc074b5 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.javac.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.javac.txt
@@ -6,7 +6,7 @@ public fun foo(): kotlin.Unit
 @kotlin.jvm.PurelyImplements(value = "kotlin.collections.MutableList") public/*package*/ open class A</*0*/ T : kotlin.Any!> : java.util.AbstractList<T!>, kotlin.collections.MutableList<T> {
     public/*package*/ constructor A</*0*/ T : kotlin.Any!>()
     protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
-    public open override /*2*/ val size: kotlin.Int
+    @get:java.lang.Override public open override /*2*/ val size: kotlin.Int
     public open override /*2*/ /*fake_override*/ fun add(/*0*/ element: T): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: T): kotlin.Unit
     public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<T>): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.txt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.txt
index 6d463cfc3ca..802ee4a0975 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.txt
@@ -6,7 +6,7 @@ public fun foo(): kotlin.Unit
 @kotlin.jvm.PurelyImplements(value = "kotlin.collections.MutableList") public/*package*/ open class A</*0*/ T : kotlin.Any!> : java.util.AbstractList<T!>, kotlin.collections.MutableList<T> {
     public/*package*/ constructor A</*0*/ T : kotlin.Any!>()
     protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
-    public open override /*2*/ val size: kotlin.Int
+    @get:java.lang.Override public open override /*2*/ val size: kotlin.Int
     public open override /*2*/ /*fake_override*/ fun add(/*0*/ element: T): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: T): kotlin.Unit
     public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<T>): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/invalidFqName.javac.txt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/invalidFqName.javac.txt
index 466e3c46309..223a38fcd71 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/invalidFqName.javac.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/invalidFqName.javac.txt
@@ -6,7 +6,7 @@ public val y: B<kotlin.String>
 @kotlin.jvm.PurelyImplements(value = "") public open class A</*0*/ T : kotlin.Any!> : java.util.AbstractList<T!> {
     public constructor A</*0*/ T : kotlin.Any!>()
     protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
-    public open override /*1*/ val size: kotlin.Int
+    @get:java.lang.Override public open override /*1*/ val size: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: T!): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: T!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/invalidFqName.txt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/invalidFqName.txt
index d37bd616aab..887d0d4bab7 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/invalidFqName.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/invalidFqName.txt
@@ -6,7 +6,7 @@ public val y: B<kotlin.String>
 @kotlin.jvm.PurelyImplements(value = "") public open class A</*0*/ T : kotlin.Any!> : java.util.AbstractList<T!> {
     public constructor A</*0*/ T : kotlin.Any!>()
     protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
-    public open override /*1*/ val size: kotlin.Int
+    @get:java.lang.Override public open override /*1*/ val size: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: T!): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: T!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/wrongTypeParametersCount.javac.txt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/wrongTypeParametersCount.javac.txt
index 6db85c53cc2..1158c15ac1e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/wrongTypeParametersCount.javac.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/wrongTypeParametersCount.javac.txt
@@ -6,7 +6,7 @@ public fun foo(): kotlin.Unit
 @kotlin.jvm.PurelyImplements(value = "kotlin.collections.MutableList") public/*package*/ open class A</*0*/ T : kotlin.Any!, /*1*/ V : kotlin.Any!> : java.util.AbstractList<T!> {
     public/*package*/ constructor A</*0*/ T : kotlin.Any!, /*1*/ V : kotlin.Any!>()
     protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
-    public open override /*1*/ val size: kotlin.Int
+    @get:java.lang.Override public open override /*1*/ val size: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: T!): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: T!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/wrongTypeParametersCount.txt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/wrongTypeParametersCount.txt
index cbcecb4aa3e..4e96c002bf3 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/wrongTypeParametersCount.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/wrongTypeParametersCount.txt
@@ -6,7 +6,7 @@ public fun foo(): kotlin.Unit
 @kotlin.jvm.PurelyImplements(value = "kotlin.collections.MutableList") public/*package*/ open class A</*0*/ T : kotlin.Any!, /*1*/ V : kotlin.Any!> : java.util.AbstractList<T!> {
     public/*package*/ constructor A</*0*/ T : kotlin.Any!, /*1*/ V : kotlin.Any!>()
     protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
-    public open override /*1*/ val size: kotlin.Int
+    @get:java.lang.Override public open override /*1*/ val size: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: T!): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: T!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
index 01fa979dd5e..bf43d92c87f 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
@@ -852,8 +852,16 @@ internal class DescriptorRendererImpl(
         property.delegateField?.let { builder.renderAnnotations(it, AnnotationUseSiteTarget.PROPERTY_DELEGATE_FIELD) }
 
         if (propertyAccessorRenderingPolicy == PropertyAccessorRenderingPolicy.NONE) {
-            property.setter?.valueParameters?.single()?.let {
-                builder.renderAnnotations(it, AnnotationUseSiteTarget.SETTER_PARAMETER)
+            property.getter?.let {
+                builder.renderAnnotations(it, AnnotationUseSiteTarget.PROPERTY_GETTER)
+            }
+            property.setter?.let { setter ->
+                setter.let {
+                    builder.renderAnnotations(it, AnnotationUseSiteTarget.PROPERTY_SETTER)
+                }
+                setter.valueParameters.single().let {
+                    builder.renderAnnotations(it, AnnotationUseSiteTarget.SETTER_PARAMETER)
+                }
             }
         }
     }