diff --git a/compiler/testData/asJava/lightClasses/AnnotatedParameterInEnumConstructor.kt b/compiler/testData/asJava/lightClasses/AnnotatedParameterInEnumConstructor.kt
index 84f0f47adf9..98c92e0a37f 100644
--- a/compiler/testData/asJava/lightClasses/AnnotatedParameterInEnumConstructor.kt
+++ b/compiler/testData/asJava/lightClasses/AnnotatedParameterInEnumConstructor.kt
@@ -6,3 +6,5 @@ annotation class Anno(val x: String)
 enum class AnnotatedParameterInEnumConstructor(@Anno("a") a: String, @Anno("b") b: String) {
     A("1", "b")
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/AnnotatedParameterInInnerClassConstructor.kt b/compiler/testData/asJava/lightClasses/AnnotatedParameterInInnerClassConstructor.kt
index 5845747652a..db5ee12ae42 100644
--- a/compiler/testData/asJava/lightClasses/AnnotatedParameterInInnerClassConstructor.kt
+++ b/compiler/testData/asJava/lightClasses/AnnotatedParameterInInnerClassConstructor.kt
@@ -12,4 +12,6 @@ class AnnotatedParameterInInnerClassConstructor {
     inner class InnerGeneric<T>(@Anno("a") a: T, @Anno("b") b: String) {
 
     }
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/JvmStatic.kt b/compiler/testData/asJava/lightClasses/JvmStatic.kt
index b396085d4a4..767f12fa7bb 100644
--- a/compiler/testData/asJava/lightClasses/JvmStatic.kt
+++ b/compiler/testData/asJava/lightClasses/JvmStatic.kt
@@ -14,4 +14,6 @@ class A {
 
         }
     }
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt b/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt
index 4524d818606..ef4652912a2 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt
@@ -3,4 +3,6 @@
 @file:JvmPackageName("a.b.c")
 package p
 
-actual typealias B = List<Int>
\ No newline at end of file
+actual typealias B = List<Int>
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.kt b/compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.kt
index 4fcd45800f5..d537c6c4132 100644
--- a/compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.kt
+++ b/compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.kt
@@ -5,4 +5,6 @@ package p
 
 fun f() {
 
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/facades/MultiFile.kt b/compiler/testData/asJava/lightClasses/facades/MultiFile.kt
index 3971075b6b4..a1b02f37ab1 100644
--- a/compiler/testData/asJava/lightClasses/facades/MultiFile.kt
+++ b/compiler/testData/asJava/lightClasses/facades/MultiFile.kt
@@ -8,5 +8,3 @@ package test
 val foo = 42
 
 typealias A = String
-
-// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt b/compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt
index 7cd6a0f07c8..63e44d1f030 100644
--- a/compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt
+++ b/compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt
@@ -4,4 +4,6 @@
 
 fun foo() {
 
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.kt b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.kt
index b6b0bc50365..d5feda70e5b 100644
--- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.kt
+++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.kt
@@ -7,4 +7,6 @@ class PrivateInClass private constructor (g: String?) {
     private val n: String?
         get() = ""
     private fun bar(a: String, b: String?): String? = null
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/DebugSymbolRenderer.kt b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/DebugSymbolRenderer.kt
index 3c88cbcb3e6..51849436dcc 100644
--- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/DebugSymbolRenderer.kt
+++ b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/DebugSymbolRenderer.kt
@@ -62,7 +62,7 @@ object DebugSymbolRenderer {
         is KtNamedConstantValue -> "${renderValue(value.name)} = ${renderValue(value.expression)}"
         is KtAnnotationCall ->
             "${renderValue(value.classId)}${value.arguments.joinToString(prefix = "(", postfix = ")") { renderValue(it) }}"
-
+        is ReceiverTypeAndAnnotations -> "${renderValue(value.annotations)} ${renderValue(value.type)}"
         else -> value::class.simpleName!!
     }
 
diff --git a/idea/idea-frontend-fir/testData/memberScopeByFqName/Int.txt b/idea/idea-frontend-fir/testData/memberScopeByFqName/Int.txt
index c26dab95452..4ba5de9ca15 100644
--- a/idea/idea-frontend-fir/testData/memberScopeByFqName/Int.txt
+++ b/idea/idea-frontend-fir/testData/memberScopeByFqName/Int.txt
@@ -13,7 +13,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: and
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -32,7 +32,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: compareTo
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -51,7 +51,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: compareTo
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -70,7 +70,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: compareTo
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -89,7 +89,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: compareTo
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -108,7 +108,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: compareTo
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -127,7 +127,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: compareTo
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -146,7 +146,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: dec
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -165,7 +165,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: div
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -184,7 +184,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: div
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Double
   typeParameters: []
@@ -203,7 +203,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: div
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Float
   typeParameters: []
@@ -222,7 +222,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: div
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -241,7 +241,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: div
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Long
   typeParameters: []
@@ -260,7 +260,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: div
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -279,7 +279,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: inc
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -298,7 +298,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: inv
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -317,7 +317,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: minus
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -336,7 +336,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: minus
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Double
   typeParameters: []
@@ -355,7 +355,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: minus
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Float
   typeParameters: []
@@ -374,7 +374,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: minus
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -393,7 +393,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: minus
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Long
   typeParameters: []
@@ -412,7 +412,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: minus
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -431,7 +431,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: or
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -450,7 +450,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: plus
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -469,7 +469,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: plus
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Double
   typeParameters: []
@@ -488,7 +488,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: plus
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Float
   typeParameters: []
@@ -507,7 +507,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: plus
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -526,7 +526,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: plus
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Long
   typeParameters: []
@@ -545,7 +545,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: plus
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -564,7 +564,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: rangeTo
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/ranges/IntRange
   typeParameters: []
@@ -583,7 +583,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: rangeTo
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/ranges/IntRange
   typeParameters: []
@@ -602,7 +602,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: rangeTo
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/ranges/LongRange
   typeParameters: []
@@ -621,7 +621,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: rangeTo
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/ranges/IntRange
   typeParameters: []
@@ -640,7 +640,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: rem
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -659,7 +659,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: rem
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Double
   typeParameters: []
@@ -678,7 +678,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: rem
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Float
   typeParameters: []
@@ -697,7 +697,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: rem
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -716,7 +716,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: rem
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Long
   typeParameters: []
@@ -735,7 +735,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: rem
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -754,7 +754,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: shl
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -773,7 +773,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: shr
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -792,7 +792,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: times
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -811,7 +811,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: times
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Double
   typeParameters: []
@@ -830,7 +830,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: times
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Float
   typeParameters: []
@@ -849,7 +849,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: times
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -868,7 +868,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: times
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Long
   typeParameters: []
@@ -887,7 +887,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: times
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -906,7 +906,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: toByte
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Byte
   typeParameters: []
@@ -925,7 +925,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: toChar
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Char
   typeParameters: []
@@ -944,7 +944,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: toDouble
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Double
   typeParameters: []
@@ -963,7 +963,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: toFloat
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Float
   typeParameters: []
@@ -982,7 +982,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: toInt
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -1001,7 +1001,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: toLong
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Long
   typeParameters: []
@@ -1020,7 +1020,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: toShort
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Short
   typeParameters: []
@@ -1039,7 +1039,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: unaryMinus
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -1058,7 +1058,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: unaryPlus
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -1077,7 +1077,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: ushr
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -1096,7 +1096,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: xor
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -1125,7 +1125,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: equals
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Boolean
   typeParameters: []
@@ -1144,7 +1144,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: hashCode
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -1163,7 +1163,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: toString
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/String
   typeParameters: []
diff --git a/idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.txt b/idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.txt
index a614fbd848b..9aec62a1556 100644
--- a/idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.txt
+++ b/idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.txt
@@ -13,7 +13,7 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: add
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Boolean
   typeParameters: []
@@ -32,7 +32,7 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: add
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Unit
   typeParameters: []
@@ -51,7 +51,7 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: addAll
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Boolean
   typeParameters: []
@@ -70,7 +70,7 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: addAll
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Boolean
   typeParameters: []
@@ -89,7 +89,7 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: clear
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Unit
   typeParameters: []
@@ -108,7 +108,7 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: listIterator
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/collections/MutableListIterator<E>
   typeParameters: []
@@ -127,7 +127,7 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: listIterator
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/collections/MutableListIterator<E>
   typeParameters: []
@@ -146,7 +146,7 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: remove
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Boolean
   typeParameters: []
@@ -165,7 +165,7 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: removeAll
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Boolean
   typeParameters: []
@@ -184,7 +184,7 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: removeAt
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: E
   typeParameters: []
@@ -203,7 +203,7 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: retainAll
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Boolean
   typeParameters: []
@@ -222,7 +222,7 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: set
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: E
   typeParameters: []
@@ -241,7 +241,7 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: subList
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/collections/MutableList<E>
   typeParameters: []
@@ -260,7 +260,7 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: contains
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Boolean
   typeParameters: []
@@ -279,7 +279,7 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: containsAll
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Boolean
   typeParameters: []
@@ -298,7 +298,7 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: get
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: E
   typeParameters: []
@@ -317,7 +317,7 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: indexOf
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -336,7 +336,7 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: isEmpty
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Boolean
   typeParameters: []
@@ -355,7 +355,7 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: iterator
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/collections/MutableIterator<E>
   typeParameters: []
@@ -374,7 +374,7 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: lastIndexOf
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -397,7 +397,7 @@ KtFirKotlinPropertySymbol:
   modality: ABSTRACT
   name: size
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   setter: null
   symbolKind: MEMBER
   type: kotlin/Int
@@ -415,7 +415,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: equals
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Boolean
   typeParameters: []
@@ -434,7 +434,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: hashCode
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -453,7 +453,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: toString
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/String
   typeParameters: []
diff --git a/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.txt b/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.txt
index 818effe453b..d09ec1a6802 100644
--- a/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.txt
+++ b/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.txt
@@ -33,7 +33,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: hash32
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -62,7 +62,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: length
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -85,7 +85,7 @@ KtFirKotlinPropertySymbol:
   modality: ABSTRACT
   name: length
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   setter: null
   symbolKind: MEMBER
   type: kotlin/Int
@@ -103,7 +103,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: isEmpty
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Boolean
   typeParameters: []
@@ -122,7 +122,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: charAt
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Char
   typeParameters: []
@@ -141,7 +141,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: codePointAt
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -160,7 +160,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: codePointBefore
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -179,7 +179,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: codePointCount
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -198,7 +198,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: offsetByCodePoints
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -217,7 +217,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: getChars
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Unit
   typeParameters: []
@@ -236,7 +236,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: getChars
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Unit
   typeParameters: []
@@ -255,7 +255,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: getBytes
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Unit
   typeParameters: []
@@ -274,7 +274,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: getBytes
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: @EnhancedNullability kotlin/ByteArray
   typeParameters: []
@@ -293,7 +293,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: getBytes
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: @EnhancedNullability kotlin/ByteArray
   typeParameters: []
@@ -312,7 +312,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: getBytes
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: @EnhancedNullability kotlin/ByteArray
   typeParameters: []
@@ -331,7 +331,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: equals
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Boolean
   typeParameters: []
@@ -350,7 +350,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: contentEquals
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Boolean
   typeParameters: []
@@ -369,7 +369,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: contentEquals
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Boolean
   typeParameters: []
@@ -388,7 +388,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: equalsIgnoreCase
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Boolean
   typeParameters: []
@@ -407,7 +407,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: compareTo
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -426,7 +426,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: compareToIgnoreCase
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -445,7 +445,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: regionMatches
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Boolean
   typeParameters: []
@@ -464,7 +464,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: regionMatches
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Boolean
   typeParameters: []
@@ -483,7 +483,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: startsWith
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Boolean
   typeParameters: []
@@ -502,7 +502,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: startsWith
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Boolean
   typeParameters: []
@@ -521,7 +521,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: endsWith
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Boolean
   typeParameters: []
@@ -540,7 +540,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: hashCode
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -559,7 +559,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: indexOf
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -578,7 +578,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: indexOf
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -597,7 +597,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: indexOf
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -616,7 +616,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: indexOf
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -635,7 +635,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: indexOfSupplementary
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -654,7 +654,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: lastIndexOf
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -673,7 +673,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: lastIndexOf
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -692,7 +692,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: lastIndexOf
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -711,7 +711,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: lastIndexOf
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -730,7 +730,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: lastIndexOfSupplementary
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -749,7 +749,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: substring
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: @EnhancedNullability kotlin/String
   typeParameters: []
@@ -768,7 +768,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: substring
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: @EnhancedNullability kotlin/String
   typeParameters: []
@@ -787,7 +787,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: subSequence
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: @EnhancedNullability kotlin/CharSequence
   typeParameters: []
@@ -806,7 +806,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: concat
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: @EnhancedNullability kotlin/String
   typeParameters: []
@@ -825,7 +825,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: replace
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: @EnhancedNullability kotlin/String
   typeParameters: []
@@ -844,7 +844,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: replace
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: @EnhancedNullability kotlin/String
   typeParameters: []
@@ -863,7 +863,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: matches
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Boolean
   typeParameters: []
@@ -882,7 +882,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: contains
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Boolean
   typeParameters: []
@@ -901,7 +901,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: replaceFirst
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: @EnhancedNullability kotlin/String
   typeParameters: []
@@ -920,7 +920,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: replaceAll
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: @EnhancedNullability kotlin/String
   typeParameters: []
@@ -939,7 +939,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: split
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: ft<@EnhancedNullability kotlin/Array<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, @EnhancedNullability kotlin/Array<out ft<@FlexibleNullability kotlin/String, kotlin/String?>!>>
   typeParameters: []
@@ -958,7 +958,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: split
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: ft<@EnhancedNullability kotlin/Array<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, @EnhancedNullability kotlin/Array<out ft<@FlexibleNullability kotlin/String, kotlin/String?>!>>
   typeParameters: []
@@ -977,7 +977,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: toLowerCase
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: @EnhancedNullability kotlin/String
   typeParameters: []
@@ -996,7 +996,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: toLowerCase
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: @EnhancedNullability kotlin/String
   typeParameters: []
@@ -1015,7 +1015,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: toUpperCase
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: @EnhancedNullability kotlin/String
   typeParameters: []
@@ -1034,7 +1034,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: toUpperCase
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: @EnhancedNullability kotlin/String
   typeParameters: []
@@ -1053,7 +1053,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: trim
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: @EnhancedNullability kotlin/String
   typeParameters: []
@@ -1072,7 +1072,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: toString
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: @FlexibleNullability kotlin/String
   typeParameters: []
@@ -1091,7 +1091,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: toCharArray
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: @EnhancedNullability kotlin/CharArray
   typeParameters: []
@@ -1110,7 +1110,7 @@ KtFirFunctionSymbol:
   modality: OPEN
   name: intern
   origin: JAVA
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: @EnhancedNullability kotlin/String
   typeParameters: []
@@ -1299,7 +1299,7 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: get
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Char
   typeParameters: []
diff --git a/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/memberFunction.txt b/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/memberFunction.txt
index 9ba31bfd9c9..12db4e5291c 100644
--- a/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/memberFunction.txt
+++ b/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/memberFunction.txt
@@ -13,7 +13,7 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: get
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: E
   typeParameters: []
diff --git a/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/memberFunctionWithOverloads.txt b/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/memberFunctionWithOverloads.txt
index a0568966067..8e85c70287f 100644
--- a/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/memberFunctionWithOverloads.txt
+++ b/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/memberFunctionWithOverloads.txt
@@ -13,7 +13,7 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: listIterator
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/collections/ListIterator<E>
   typeParameters: []
@@ -32,7 +32,7 @@ KtFirFunctionSymbol:
   modality: ABSTRACT
   name: listIterator
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/collections/ListIterator<E>
   typeParameters: []
diff --git a/idea/idea-frontend-fir/testData/symbolPointer/memberFunctions.kt b/idea/idea-frontend-fir/testData/symbolPointer/memberFunctions.kt
index bc8e6474996..844c5a04c34 100644
--- a/idea/idea-frontend-fir/testData/symbolPointer/memberFunctions.kt
+++ b/idea/idea-frontend-fir/testData/symbolPointer/memberFunctions.kt
@@ -16,7 +16,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: x
   origin: SOURCE
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
@@ -35,7 +35,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: y
   origin: SOURCE
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Unit
   typeParameters: []
diff --git a/idea/idea-frontend-fir/testData/symbolPointer/memberProperties.kt b/idea/idea-frontend-fir/testData/symbolPointer/memberProperties.kt
index a4abfb50b6d..9c46bf6f8d7 100644
--- a/idea/idea-frontend-fir/testData/symbolPointer/memberProperties.kt
+++ b/idea/idea-frontend-fir/testData/symbolPointer/memberProperties.kt
@@ -20,13 +20,14 @@ KtFirKotlinPropertySymbol:
   modality: FINAL
   name: x
   origin: SOURCE
-  receiverType: null
+  receiverTypeAndAnnotations: null
   setter: null
   symbolKind: MEMBER
   type: kotlin/Int
   visibility: PUBLIC
 
 KtFirPropertyGetterSymbol:
+  annotations: []
   hasBody: true
   isDefault: false
   isInline: false
@@ -53,7 +54,7 @@ KtFirKotlinPropertySymbol:
   modality: FINAL
   name: y
   origin: SOURCE
-  receiverType: kotlin/Int
+  receiverTypeAndAnnotations: [] kotlin/Int
   setter: null
   symbolKind: MEMBER
   type: kotlin/Int
diff --git a/idea/idea-frontend-fir/testData/symbolPointer/topLevelFunctions.kt b/idea/idea-frontend-fir/testData/symbolPointer/topLevelFunctions.kt
index 056966817f2..17777c8c6c9 100644
--- a/idea/idea-frontend-fir/testData/symbolPointer/topLevelFunctions.kt
+++ b/idea/idea-frontend-fir/testData/symbolPointer/topLevelFunctions.kt
@@ -14,7 +14,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: x
   origin: SOURCE
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: TOP_LEVEL
   type: kotlin/Int
   typeParameters: []
@@ -33,7 +33,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: y
   origin: SOURCE
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: TOP_LEVEL
   type: kotlin/Unit
   typeParameters: []
diff --git a/idea/idea-frontend-fir/testData/symbolPointer/topLevelProperties.kt b/idea/idea-frontend-fir/testData/symbolPointer/topLevelProperties.kt
index 844e3c8751a..ad553f09584 100644
--- a/idea/idea-frontend-fir/testData/symbolPointer/topLevelProperties.kt
+++ b/idea/idea-frontend-fir/testData/symbolPointer/topLevelProperties.kt
@@ -18,13 +18,14 @@ KtFirKotlinPropertySymbol:
   modality: FINAL
   name: x
   origin: SOURCE
-  receiverType: null
+  receiverTypeAndAnnotations: null
   setter: null
   symbolKind: TOP_LEVEL
   type: kotlin/Int
   visibility: PUBLIC
 
 KtFirPropertyGetterSymbol:
+  annotations: []
   hasBody: true
   isDefault: false
   isInline: false
@@ -51,7 +52,7 @@ KtFirKotlinPropertySymbol:
   modality: FINAL
   name: y
   origin: SOURCE
-  receiverType: kotlin/Int
+  receiverTypeAndAnnotations: [] kotlin/Int
   setter: null
   symbolKind: TOP_LEVEL
   type: kotlin/Int
diff --git a/idea/idea-frontend-fir/testData/symbolsByFqName/fileWalkDirectionEnum.txt b/idea/idea-frontend-fir/testData/symbolsByFqName/fileWalkDirectionEnum.txt
index cbd871d78c6..02091117866 100644
--- a/idea/idea-frontend-fir/testData/symbolsByFqName/fileWalkDirectionEnum.txt
+++ b/idea/idea-frontend-fir/testData/symbolsByFqName/fileWalkDirectionEnum.txt
@@ -13,7 +13,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: listOf
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: TOP_LEVEL
   type: kotlin/collections/List<T>
   typeParameters: [KtFirTypeParameterSymbol(T)]
@@ -32,7 +32,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: listOf
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: TOP_LEVEL
   type: kotlin/collections/List<T>
   typeParameters: [KtFirTypeParameterSymbol(T)]
@@ -51,7 +51,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: listOf
   origin: LIBRARY
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: TOP_LEVEL
   type: kotlin/collections/List<T>
   typeParameters: [KtFirTypeParameterSymbol(T)]
diff --git a/idea/idea-frontend-fir/testData/symbolsByPsi/annotations.kt b/idea/idea-frontend-fir/testData/symbolsByPsi/annotations.kt
index 22b530ff6d7..15c53a7a7d4 100644
--- a/idea/idea-frontend-fir/testData/symbolsByPsi/annotations.kt
+++ b/idea/idea-frontend-fir/testData/symbolsByPsi/annotations.kt
@@ -66,7 +66,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: x
   origin: SOURCE
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Unit
   typeParameters: []
diff --git a/idea/idea-frontend-fir/testData/symbolsByPsi/anonymousObject.kt b/idea/idea-frontend-fir/testData/symbolsByPsi/anonymousObject.kt
index 00273c4e079..06443c07def 100644
--- a/idea/idea-frontend-fir/testData/symbolsByPsi/anonymousObject.kt
+++ b/idea/idea-frontend-fir/testData/symbolsByPsi/anonymousObject.kt
@@ -21,7 +21,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: run
   origin: SOURCE
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Unit
   typeParameters: []
@@ -44,7 +44,7 @@ KtFirKotlinPropertySymbol:
   modality: FINAL
   name: data
   origin: SOURCE
-  receiverType: null
+  receiverTypeAndAnnotations: null
   setter: null
   symbolKind: MEMBER
   type: kotlin/Int
@@ -72,7 +72,7 @@ KtFirKotlinPropertySymbol:
   modality: FINAL
   name: anonymousObject
   origin: SOURCE
-  receiverType: null
+  receiverTypeAndAnnotations: null
   setter: null
   symbolKind: MEMBER
   type: java/lang/Runnable
diff --git a/idea/idea-frontend-fir/testData/symbolsByPsi/classMembes.kt b/idea/idea-frontend-fir/testData/symbolsByPsi/classMembes.kt
index 09c1a8f21d3..a09e8d0f015 100644
--- a/idea/idea-frontend-fir/testData/symbolsByPsi/classMembes.kt
+++ b/idea/idea-frontend-fir/testData/symbolsByPsi/classMembes.kt
@@ -21,7 +21,7 @@ KtFirKotlinPropertySymbol:
   modality: FINAL
   name: a
   origin: SOURCE
-  receiverType: null
+  receiverTypeAndAnnotations: null
   setter: null
   symbolKind: MEMBER
   type: kotlin/Int
@@ -39,7 +39,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: x
   origin: SOURCE
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: MEMBER
   type: kotlin/Int
   typeParameters: []
diff --git a/idea/idea-frontend-fir/testData/symbolsByPsi/extensionFunction.kt b/idea/idea-frontend-fir/testData/symbolsByPsi/extensionFunction.kt
index d9aaa3c8a13..b519d7d447e 100644
--- a/idea/idea-frontend-fir/testData/symbolsByPsi/extensionFunction.kt
+++ b/idea/idea-frontend-fir/testData/symbolsByPsi/extensionFunction.kt
@@ -14,7 +14,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: foo
   origin: SOURCE
-  receiverType: kotlin/String
+  receiverTypeAndAnnotations: [] kotlin/String
   symbolKind: TOP_LEVEL
   type: kotlin/Int
   typeParameters: []
diff --git a/idea/idea-frontend-fir/testData/symbolsByPsi/function.kt b/idea/idea-frontend-fir/testData/symbolsByPsi/function.kt
index fc02eb2f91b..a460b74a83e 100644
--- a/idea/idea-frontend-fir/testData/symbolsByPsi/function.kt
+++ b/idea/idea-frontend-fir/testData/symbolsByPsi/function.kt
@@ -23,7 +23,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: foo
   origin: SOURCE
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: TOP_LEVEL
   type: kotlin/Unit
   typeParameters: []
diff --git a/idea/idea-frontend-fir/testData/symbolsByPsi/functionWithTypeParams.kt b/idea/idea-frontend-fir/testData/symbolsByPsi/functionWithTypeParams.kt
index adbda64cf30..4ba2957b865 100644
--- a/idea/idea-frontend-fir/testData/symbolsByPsi/functionWithTypeParams.kt
+++ b/idea/idea-frontend-fir/testData/symbolsByPsi/functionWithTypeParams.kt
@@ -28,7 +28,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: foo
   origin: SOURCE
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: TOP_LEVEL
   type: kotlin/Unit
   typeParameters: [KtFirTypeParameterSymbol(X)]
diff --git a/idea/idea-frontend-fir/testData/symbolsByPsi/implicitReturn.kt b/idea/idea-frontend-fir/testData/symbolsByPsi/implicitReturn.kt
index 309f6d8c489..f044fbf1734 100644
--- a/idea/idea-frontend-fir/testData/symbolsByPsi/implicitReturn.kt
+++ b/idea/idea-frontend-fir/testData/symbolsByPsi/implicitReturn.kt
@@ -14,7 +14,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: foo
   origin: SOURCE
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: TOP_LEVEL
   type: kotlin/Int
   typeParameters: []
diff --git a/idea/idea-frontend-fir/testData/symbolsByPsi/localDeclarations.kt b/idea/idea-frontend-fir/testData/symbolsByPsi/localDeclarations.kt
index 1eb884277e7..db3272312ed 100644
--- a/idea/idea-frontend-fir/testData/symbolsByPsi/localDeclarations.kt
+++ b/idea/idea-frontend-fir/testData/symbolsByPsi/localDeclarations.kt
@@ -26,7 +26,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: aaa
   origin: SOURCE
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: LOCAL
   type: kotlin/Unit
   typeParameters: []
@@ -60,7 +60,7 @@ KtFirFunctionSymbol:
   modality: FINAL
   name: yyy
   origin: SOURCE
-  receiverType: null
+  receiverTypeAndAnnotations: null
   symbolKind: TOP_LEVEL
   type: kotlin/Unit
   typeParameters: []
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/jvmStaticFun.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/jvmStaticFun.0.kt
index b71d57e7aa2..9121bc34072 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/jvmStaticFun.0.kt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/jvmStaticFun.0.kt
@@ -6,4 +6,6 @@ class Foo {
 
         }
     }
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/jvmStaticJvmOverloadsFun.0.kt b/idea/testData/findUsages/kotlin/findFunctionUsages/jvmStaticJvmOverloadsFun.0.kt
index 37203fbd4c3..317211f6da9 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/jvmStaticJvmOverloadsFun.0.kt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/jvmStaticJvmOverloadsFun.0.kt
@@ -8,4 +8,6 @@ class Foo {
 
         }
     }
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
\ No newline at end of file