diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/argumentsOfAnnotations.kt b/compiler/fir/analysis-tests/testData/resolve/arguments/argumentsOfAnnotations.kt
index 011caf4c598..00edbbbefcc 100644
--- a/compiler/fir/analysis-tests/testData/resolve/arguments/argumentsOfAnnotations.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/arguments/argumentsOfAnnotations.kt
@@ -5,5 +5,5 @@ class A
 
 annotation class AnnVarargs(val x: Int, vararg val y: String, val z: Int)
 
-@AnnVarargs(1, "a", "b", "c", <!NO_VALUE_FOR_PARAMETER!>2)<!>
+@AnnVarargs(1, "a", "b", "c", <!NO_VALUE_FOR_PARAMETER!><!ARGUMENT_TYPE_MISMATCH!>2<!>)<!>
 class B
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/default.kt b/compiler/fir/analysis-tests/testData/resolve/arguments/default.kt
index ac097bd9833..3e73a30ebbd 100644
--- a/compiler/fir/analysis-tests/testData/resolve/arguments/default.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/arguments/default.kt
@@ -15,7 +15,7 @@ fun test() {
     bar(1, 2.0, true)
     bar(1, 2.0, true, "my")
 
-    bar(1, <!NO_VALUE_FOR_PARAMETER!>true)<!>
+    bar(1, <!NO_VALUE_FOR_PARAMETER!><!ARGUMENT_TYPE_MISMATCH!>true<!>)<!>
 
     baz(1)
     baz(1, "my", "yours")
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/lambda.kt b/compiler/fir/analysis-tests/testData/resolve/arguments/lambda.kt
index a6e28c278e9..b4a477462ca 100644
--- a/compiler/fir/analysis-tests/testData/resolve/arguments/lambda.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/arguments/lambda.kt
@@ -10,7 +10,7 @@ fun test() {
     foo({})
 
     // Bad
-    foo(1) <!TOO_MANY_ARGUMENTS!>{}<!>
+    foo(<!ARGUMENT_TYPE_MISMATCH!>1<!>) <!TOO_MANY_ARGUMENTS!>{}<!>
     foo(f = {}) <!TOO_MANY_ARGUMENTS!>{}<!>
 
     // OK
@@ -21,14 +21,14 @@ fun test() {
 
     // Bad
     <!NO_VALUE_FOR_PARAMETER!>bar<!> {}
-    bar(<!NO_VALUE_FOR_PARAMETER!>{})<!>
+    bar(<!NO_VALUE_FOR_PARAMETER!><!ARGUMENT_TYPE_MISMATCH!>{}<!>)<!>
 
     // OK
     baz(other = false, f = {})
     baz({}, false)
 
     // Bad
-    <!NO_VALUE_FOR_PARAMETER!>baz<!> {}
-    baz<!NO_VALUE_FOR_PARAMETER!>()<!> {}
+    <!NO_VALUE_FOR_PARAMETER!>baz<!> <!ARGUMENT_TYPE_MISMATCH!>{}<!>
+    baz<!NO_VALUE_FOR_PARAMETER!>()<!> <!ARGUMENT_TYPE_MISMATCH!>{}<!>
     baz(<!NO_VALUE_FOR_PARAMETER!>other = false)<!> <!TOO_MANY_ARGUMENTS!>{}<!>
 }
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/vararg.kt b/compiler/fir/analysis-tests/testData/resolve/arguments/vararg.kt
index 57da9476ce9..1d48314a728 100644
--- a/compiler/fir/analysis-tests/testData/resolve/arguments/vararg.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/arguments/vararg.kt
@@ -13,6 +13,6 @@ fun test() {
     bar(1, z = true, y = *<!REDUNDANT_SPREAD_OPERATOR_IN_NAMED_FORM_IN_FUNCTION!>arrayOf("my", "yours")<!>)
 
     bar(0, z = false, y = <!ARGUMENT_TYPE_MISMATCH, ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>""<!>, <!ARGUMENT_PASSED_TWICE!>y<!> = "other")
-    bar(0, "", <!NO_VALUE_FOR_PARAMETER!>true)<!>
+    bar(0, "", <!NO_VALUE_FOR_PARAMETER!><!ARGUMENT_TYPE_MISMATCH!>true<!>)<!>
     bar(0, z = false, y = <!ARGUMENT_TYPE_MISMATCH, ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>""<!>, <!ARGUMENT_PASSED_TWICE!>y<!> = "other", <!ARGUMENT_PASSED_TWICE!>y<!> = "yet other")
 }
diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/coneDiagnosticToFirDiagnostic.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/coneDiagnosticToFirDiagnostic.kt
index 1bfd996d9a0..ddba7722f77 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/coneDiagnosticToFirDiagnostic.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/coneDiagnosticToFirDiagnostic.kt
@@ -259,7 +259,9 @@ private fun mapInapplicableCandidateError(
 ): List<KtDiagnostic> {
     val typeContext = session.typeContext
     val genericDiagnostic = FirErrors.INAPPLICABLE_CANDIDATE.createOn(source, diagnostic.candidate.symbol)
-    val diagnostics = diagnostic.candidate.diagnostics.filter { it.applicability == diagnostic.applicability }.mapNotNull { rootCause ->
+    val diagnostics = diagnostic.candidate.diagnostics.filter {
+        it.applicability.userRelevantApplicability == diagnostic.applicability.userRelevantApplicability
+    }.mapNotNull { rootCause ->
         when (rootCause) {
             is VarargArgumentOutsideParentheses -> FirErrors.VARARG_OUTSIDE_PARENTHESES.createOn(
                 rootCause.argument.source ?: qualifiedAccessSource
@@ -368,6 +370,12 @@ private fun mapInapplicableCandidateError(
     }
 }
 
+private val CandidateApplicability.userRelevantApplicability: CandidateApplicability
+    get() = when (this) {
+        CandidateApplicability.INAPPLICABLE_ARGUMENTS_MAPPING_ERROR -> CandidateApplicability.INAPPLICABLE
+        else -> this
+    }
+
 private fun mapSystemHasContradictionError(
     session: FirSession,
     diagnostic: ConeConstraintSystemHasContradiction,
diff --git a/compiler/testData/cli/jvm/wrongAbiVersion.out b/compiler/testData/cli/jvm/wrongAbiVersion.out
index e5b32c9bc65..7d1ae2c4724 100644
--- a/compiler/testData/cli/jvm/wrongAbiVersion.out
+++ b/compiler/testData/cli/jvm/wrongAbiVersion.out
@@ -7,6 +7,9 @@ fun foo(x: ClassWithWrongAbiVersion) {
 compiler/testData/cli/jvm/wrongAbiVersion.kt:4:5: error: unresolved reference 'bar'.
     bar()
     ^
+compiler/testData/cli/jvm/wrongAbiVersion.kt:6:21: error: argument type mismatch: actual type is 'kotlin.Int', but 'kotlin.String' was expected.
+    1.replaceIndent(2, 3)
+                    ^
 compiler/testData/cli/jvm/wrongAbiVersion.kt:6:24: error: too many arguments for 'public final fun kotlin/String.kotlin/text/replaceIndent(newIndent: kotlin/String = STUB): kotlin/String'.
     1.replaceIndent(2, 3)
                        ^
diff --git a/compiler/testData/diagnostics/tests/argumentTypeMismatchVsTooManyArgs.fir.kt b/compiler/testData/diagnostics/tests/argumentTypeMismatchVsTooManyArgs.fir.kt
index 14e27dd5a12..21f4972d5a5 100644
--- a/compiler/testData/diagnostics/tests/argumentTypeMismatchVsTooManyArgs.fir.kt
+++ b/compiler/testData/diagnostics/tests/argumentTypeMismatchVsTooManyArgs.fir.kt
@@ -3,7 +3,7 @@
 fun foo(i1: Int) {}
 
 fun test() {
-    foo("",
+    foo(<!ARGUMENT_TYPE_MISMATCH!>""<!>,
         <!TOO_MANY_ARGUMENTS!>2<!>
     )
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.fir.kt b/compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.fir.kt
index 67ba488f8f7..a32e88bc069 100644
--- a/compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.fir.kt
+++ b/compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.fir.kt
@@ -12,17 +12,17 @@ fun test() {
 
     bar <!TOO_MANY_ARGUMENTS!>{ }<!>
 
-    foo("", 1, <!TOO_MANY_ARGUMENTS, UNRESOLVED_REFERENCE!>xx<!>)
+    foo(<!ARGUMENT_TYPE_MISMATCH!>""<!>, <!ARGUMENT_TYPE_MISMATCH!>1<!>, <!TOO_MANY_ARGUMENTS, UNRESOLVED_REFERENCE!>xx<!>)
 
-    foo(<!NAMED_PARAMETER_NOT_FOUND!>r<!> = <!UNRESOLVED_REFERENCE!>xx<!>, i = "", s = "")
+    foo(<!NAMED_PARAMETER_NOT_FOUND!>r<!> = <!UNRESOLVED_REFERENCE!>xx<!>, i = <!ARGUMENT_TYPE_MISMATCH!>""<!>, s = "")
 
     foo(i = 1, <!ARGUMENT_PASSED_TWICE!>i<!> = 1, s = <!ARGUMENT_TYPE_MISMATCH!>11<!>)
 
     foo(<!ARGUMENT_TYPE_MISMATCH!>""<!>, s = <!ARGUMENT_TYPE_MISMATCH!>2<!>)
 
-    foo(i = "", s = 2, <!TOO_MANY_ARGUMENTS!>33<!>)
+    foo(i = <!ARGUMENT_TYPE_MISMATCH!>""<!>, s = <!ARGUMENT_TYPE_MISMATCH!>2<!>, <!TOO_MANY_ARGUMENTS!>33<!>)
 
-    foo("", 1) <!TOO_MANY_ARGUMENTS!>{}<!>
+    foo(<!ARGUMENT_TYPE_MISMATCH!>""<!>, <!ARGUMENT_TYPE_MISMATCH!>1<!>) <!TOO_MANY_ARGUMENTS!>{}<!>
 
-    foo("", 1) <!TOO_MANY_ARGUMENTS!>{}<!> <!MANY_LAMBDA_EXPRESSION_ARGUMENTS!>{}<!>
+    foo(<!ARGUMENT_TYPE_MISMATCH!>""<!>, <!ARGUMENT_TYPE_MISMATCH!>1<!>) <!TOO_MANY_ARGUMENTS!>{}<!> <!MANY_LAMBDA_EXPRESSION_ARGUMENTS!>{}<!>
 }
diff --git a/compiler/testData/diagnostics/tests/delegation/kt44843.fir.kt b/compiler/testData/diagnostics/tests/delegation/kt44843.fir.kt
index b0aaa61274f..b00f001dd65 100644
--- a/compiler/testData/diagnostics/tests/delegation/kt44843.fir.kt
+++ b/compiler/testData/diagnostics/tests/delegation/kt44843.fir.kt
@@ -1,13 +1,13 @@
 // WITH_STDLIB
 
 // FILE: test.kt
-val bar2 by bar2<!NO_VALUE_FOR_PARAMETER!>()<!>
+val bar2 by <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>bar2<!><!NO_VALUE_FOR_PARAMETER!>()<!>
 
 // FILE: lt/neworld/compiler/Foo.kt
 package lt.neworld.compiler
 
 class Foo {
-    val bar by bar<!NO_VALUE_FOR_PARAMETER!>()<!>
+    val bar by <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>bar<!><!NO_VALUE_FOR_PARAMETER!>()<!>
 }
 
 // FILE: lt/neworld/compiler/bar/Bar.kt
diff --git a/compiler/testData/diagnostics/tests/extensions/variableInvoke.fir.kt b/compiler/testData/diagnostics/tests/extensions/variableInvoke.fir.kt
index 2a4208f86a3..696e846d50a 100644
--- a/compiler/testData/diagnostics/tests/extensions/variableInvoke.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/variableInvoke.fir.kt
@@ -6,6 +6,6 @@ class A(foo: Int.() -> Unit) {
 
 fun test(foo: Int.(String) -> Unit) {
     4.foo("")
-    4.foo(<!NO_VALUE_FOR_PARAMETER!><!NAMED_ARGUMENTS_NOT_ALLOWED!>p1<!> = "")<!>
+    4.foo(<!NO_VALUE_FOR_PARAMETER!><!ARGUMENT_PASSED_TWICE, NAMED_ARGUMENTS_NOT_ALLOWED!>p1<!> = "")<!>
     4.foo(<!NAMED_ARGUMENTS_NOT_ALLOWED!>p2<!> = "")
 }
diff --git a/compiler/testData/diagnostics/tests/namedArguments/namedArgumentsAndDefaultValues.fir.kt b/compiler/testData/diagnostics/tests/namedArguments/namedArgumentsAndDefaultValues.fir.kt
index 762d18f3200..d2df37bf784 100644
--- a/compiler/testData/diagnostics/tests/namedArguments/namedArgumentsAndDefaultValues.fir.kt
+++ b/compiler/testData/diagnostics/tests/namedArguments/namedArgumentsAndDefaultValues.fir.kt
@@ -15,7 +15,7 @@ fun test() {
 
     bar(z = "")
     bar<!NO_VALUE_FOR_PARAMETER!>()<!>
-    bar(<!NO_VALUE_FOR_PARAMETER!>"")<!>
+    bar(<!NO_VALUE_FOR_PARAMETER!><!ARGUMENT_TYPE_MISMATCH!>""<!>)<!>
     bar(1, 1, "")
     bar(1, 1, "")
     bar(1, z = "")
diff --git a/compiler/testData/diagnostics/tests/regressions/kt10633.fir.kt b/compiler/testData/diagnostics/tests/regressions/kt10633.fir.kt
index 76d3a221907..c4d40fb40d8 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt10633.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt10633.fir.kt
@@ -15,5 +15,5 @@ fun main() {
     1.set(2, z = 1)
     1[2] += 1
 
-    1.set(2, <!NO_VALUE_FOR_PARAMETER!>1)<!>
+    1.set(2, <!NO_VALUE_FOR_PARAMETER!><!ARGUMENT_TYPE_MISMATCH!>1<!>)<!>
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/incompleteConstructorInvocation.fir.kt b/compiler/testData/diagnostics/tests/resolve/incompleteConstructorInvocation.fir.kt
index 11d1435e5e4..becedfa1865 100644
--- a/compiler/testData/diagnostics/tests/resolve/incompleteConstructorInvocation.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/incompleteConstructorInvocation.fir.kt
@@ -4,7 +4,7 @@ class X<V>(provider: () -> V, trackValue: Boolean) {
 }
 
 class B {
-    val c = <!NO_VALUE_FOR_PARAMETER!>X<!><String> {
+    val c = <!NO_VALUE_FOR_PARAMETER!>X<!><String> <!ARGUMENT_TYPE_MISMATCH!>{
         "e"
-    }
+    }<!>
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.fir.kt b/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.fir.kt
index d944dd6727f..9b35f1fddd6 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.fir.kt
@@ -6,7 +6,7 @@ fun test1() {
 
 fun test2(f: String.(Int) -> Unit) {
     <!ARGUMENT_TYPE_MISMATCH!>11<!>.(f)(1)
-    11.(f)<!NO_VALUE_FOR_PARAMETER!>()<!>
+    <!ARGUMENT_TYPE_MISMATCH!>11<!>.(f)<!NO_VALUE_FOR_PARAMETER!>()<!>
 }
 
 fun test3() {
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/functionExpectedWhenSeveralInvokesExist.fir.kt b/compiler/testData/diagnostics/tests/resolve/invoke/functionExpectedWhenSeveralInvokesExist.fir.kt
index ade7feeb8ad..134ad957b31 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/functionExpectedWhenSeveralInvokesExist.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/functionExpectedWhenSeveralInvokesExist.fir.kt
@@ -8,6 +8,6 @@ class SomeClass
 fun test(identifier: SomeClass, fn: String.() -> Unit) {
     <!NONE_APPLICABLE!>identifier<!>()
     <!NONE_APPLICABLE!>identifier<!>(123)
-    identifier(1, <!TOO_MANY_ARGUMENTS!>2<!>)
+    identifier(<!ARGUMENT_TYPE_MISMATCH!>1<!>, <!TOO_MANY_ARGUMENTS!>2<!>)
     <!ARGUMENT_TYPE_MISMATCH!>1<!>.fn()
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/newLineLambda.fir.kt b/compiler/testData/diagnostics/tests/resolve/newLineLambda.fir.kt
index aa778e14fa5..86b296be1dd 100644
--- a/compiler/testData/diagnostics/tests/resolve/newLineLambda.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/newLineLambda.fir.kt
@@ -82,8 +82,8 @@ fun testVararg() {
     varargFn(1,2,3) // comment
     // comment
     <!VARARG_OUTSIDE_PARENTHESES!>{}<!>
-    varargFn(1,2,3) {} <!MANY_LAMBDA_EXPRESSION_ARGUMENTS!>{}<!>
-    varargFn(1,2,3) {}
+    varargFn(1,2,3) <!VARARG_OUTSIDE_PARENTHESES!>{}<!> <!MANY_LAMBDA_EXPRESSION_ARGUMENTS!>{}<!>
+    varargFn(1,2,3) <!VARARG_OUTSIDE_PARENTHESES!>{}<!>
     <!MANY_LAMBDA_EXPRESSION_ARGUMENTS!>{}<!>
 }
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/tooManyArgs.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/tooManyArgs.fir.kt
index 91d7187dd78..0d030278322 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/tooManyArgs.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/tooManyArgs.fir.kt
@@ -6,6 +6,6 @@ public @interface A {
 }
 
 // FILE: b.kt
-@A(<!POSITIONED_VALUE_ARGUMENT_FOR_JAVA_ANNOTATION!>false<!>,
+@A(<!ARGUMENT_TYPE_MISMATCH, POSITIONED_VALUE_ARGUMENT_FOR_JAVA_ANNOTATION!>false<!>,
 <!POSITIONED_VALUE_ARGUMENT_FOR_JAVA_ANNOTATION!>1.0<!>,
 <!POSITIONED_VALUE_ARGUMENT_FOR_JAVA_ANNOTATION!>false<!>, <!TOO_MANY_ARGUMENTS!>1<!>, <!TOO_MANY_ARGUMENTS!>2<!>) fun foo1() {}