diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
index 0377361eb47..b55a566c47e 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
@@ -39472,12 +39472,42 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
         runTest("compiler/testData/diagnostics/tests/typealias/importForTypealiasObject.kt");
       }
 
+      @Test
+      @TestMetadata("importFromTypeAliasExtendedInvokableObject.kt")
+      public void testImportFromTypeAliasExtendedInvokableObject() {
+        runTest("compiler/testData/diagnostics/tests/typealias/importFromTypeAliasExtendedInvokableObject.kt");
+      }
+
+      @Test
+      @TestMetadata("importFromTypeAliasFunctionReference.kt")
+      public void testImportFromTypeAliasFunctionReference() {
+        runTest("compiler/testData/diagnostics/tests/typealias/importFromTypeAliasFunctionReference.kt");
+      }
+
+      @Test
+      @TestMetadata("importFromTypeAliasInvokableObject.kt")
+      public void testImportFromTypeAliasInvokableObject() {
+        runTest("compiler/testData/diagnostics/tests/typealias/importFromTypeAliasInvokableObject.kt");
+      }
+
+      @Test
+      @TestMetadata("importFromTypeAliasNestedObjectFunMember.kt")
+      public void testImportFromTypeAliasNestedObjectFunMember() {
+        runTest("compiler/testData/diagnostics/tests/typealias/importFromTypeAliasNestedObjectFunMember.kt");
+      }
+
       @Test
       @TestMetadata("importFromTypeAliasObject.kt")
       public void testImportFromTypeAliasObject() {
         runTest("compiler/testData/diagnostics/tests/typealias/importFromTypeAliasObject.kt");
       }
 
+      @Test
+      @TestMetadata("importFromTypeAliasObjectProperties.kt")
+      public void testImportFromTypeAliasObjectProperties() {
+        runTest("compiler/testData/diagnostics/tests/typealias/importFromTypeAliasObjectProperties.kt");
+      }
+
       @Test
       @TestMetadata("importMemberFromJavaViaAlias.kt")
       public void testImportMemberFromJavaViaAlias() {
diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
index cdf6201028a..7361aefd12e 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
@@ -39472,12 +39472,42 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
         runTest("compiler/testData/diagnostics/tests/typealias/importForTypealiasObject.kt");
       }
 
+      @Test
+      @TestMetadata("importFromTypeAliasExtendedInvokableObject.kt")
+      public void testImportFromTypeAliasExtendedInvokableObject() {
+        runTest("compiler/testData/diagnostics/tests/typealias/importFromTypeAliasExtendedInvokableObject.kt");
+      }
+
+      @Test
+      @TestMetadata("importFromTypeAliasFunctionReference.kt")
+      public void testImportFromTypeAliasFunctionReference() {
+        runTest("compiler/testData/diagnostics/tests/typealias/importFromTypeAliasFunctionReference.kt");
+      }
+
+      @Test
+      @TestMetadata("importFromTypeAliasInvokableObject.kt")
+      public void testImportFromTypeAliasInvokableObject() {
+        runTest("compiler/testData/diagnostics/tests/typealias/importFromTypeAliasInvokableObject.kt");
+      }
+
+      @Test
+      @TestMetadata("importFromTypeAliasNestedObjectFunMember.kt")
+      public void testImportFromTypeAliasNestedObjectFunMember() {
+        runTest("compiler/testData/diagnostics/tests/typealias/importFromTypeAliasNestedObjectFunMember.kt");
+      }
+
       @Test
       @TestMetadata("importFromTypeAliasObject.kt")
       public void testImportFromTypeAliasObject() {
         runTest("compiler/testData/diagnostics/tests/typealias/importFromTypeAliasObject.kt");
       }
 
+      @Test
+      @TestMetadata("importFromTypeAliasObjectProperties.kt")
+      public void testImportFromTypeAliasObjectProperties() {
+        runTest("compiler/testData/diagnostics/tests/typealias/importFromTypeAliasObjectProperties.kt");
+      }
+
       @Test
       @TestMetadata("importMemberFromJavaViaAlias.kt")
       public void testImportMemberFromJavaViaAlias() {
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
index d9ab9ccf5d2..00702208337 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
@@ -37038,12 +37038,42 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
         runTest("compiler/testData/diagnostics/tests/typealias/importForTypealiasObject.kt");
       }
 
+      @Test
+      @TestMetadata("importFromTypeAliasExtendedInvokableObject.kt")
+      public void testImportFromTypeAliasExtendedInvokableObject() {
+        runTest("compiler/testData/diagnostics/tests/typealias/importFromTypeAliasExtendedInvokableObject.kt");
+      }
+
+      @Test
+      @TestMetadata("importFromTypeAliasFunctionReference.kt")
+      public void testImportFromTypeAliasFunctionReference() {
+        runTest("compiler/testData/diagnostics/tests/typealias/importFromTypeAliasFunctionReference.kt");
+      }
+
+      @Test
+      @TestMetadata("importFromTypeAliasInvokableObject.kt")
+      public void testImportFromTypeAliasInvokableObject() {
+        runTest("compiler/testData/diagnostics/tests/typealias/importFromTypeAliasInvokableObject.kt");
+      }
+
+      @Test
+      @TestMetadata("importFromTypeAliasNestedObjectFunMember.kt")
+      public void testImportFromTypeAliasNestedObjectFunMember() {
+        runTest("compiler/testData/diagnostics/tests/typealias/importFromTypeAliasNestedObjectFunMember.kt");
+      }
+
       @Test
       @TestMetadata("importFromTypeAliasObject.kt")
       public void testImportFromTypeAliasObject() {
         runTest("compiler/testData/diagnostics/tests/typealias/importFromTypeAliasObject.kt");
       }
 
+      @Test
+      @TestMetadata("importFromTypeAliasObjectProperties.kt")
+      public void testImportFromTypeAliasObjectProperties() {
+        runTest("compiler/testData/diagnostics/tests/typealias/importFromTypeAliasObjectProperties.kt");
+      }
+
       @Test
       @TestMetadata("importMemberFromJavaViaAlias.kt")
       public void testImportMemberFromJavaViaAlias() {
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
index 42c3c675e14..9dab646e876 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
@@ -37176,12 +37176,42 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
         runTest("compiler/testData/diagnostics/tests/typealias/importForTypealiasObject.kt");
       }
 
+      @Test
+      @TestMetadata("importFromTypeAliasExtendedInvokableObject.kt")
+      public void testImportFromTypeAliasExtendedInvokableObject() {
+        runTest("compiler/testData/diagnostics/tests/typealias/importFromTypeAliasExtendedInvokableObject.kt");
+      }
+
+      @Test
+      @TestMetadata("importFromTypeAliasFunctionReference.kt")
+      public void testImportFromTypeAliasFunctionReference() {
+        runTest("compiler/testData/diagnostics/tests/typealias/importFromTypeAliasFunctionReference.kt");
+      }
+
+      @Test
+      @TestMetadata("importFromTypeAliasInvokableObject.kt")
+      public void testImportFromTypeAliasInvokableObject() {
+        runTest("compiler/testData/diagnostics/tests/typealias/importFromTypeAliasInvokableObject.kt");
+      }
+
+      @Test
+      @TestMetadata("importFromTypeAliasNestedObjectFunMember.kt")
+      public void testImportFromTypeAliasNestedObjectFunMember() {
+        runTest("compiler/testData/diagnostics/tests/typealias/importFromTypeAliasNestedObjectFunMember.kt");
+      }
+
       @Test
       @TestMetadata("importFromTypeAliasObject.kt")
       public void testImportFromTypeAliasObject() {
         runTest("compiler/testData/diagnostics/tests/typealias/importFromTypeAliasObject.kt");
       }
 
+      @Test
+      @TestMetadata("importFromTypeAliasObjectProperties.kt")
+      public void testImportFromTypeAliasObjectProperties() {
+        runTest("compiler/testData/diagnostics/tests/typealias/importFromTypeAliasObjectProperties.kt");
+      }
+
       @Test
       @TestMetadata("importMemberFromJavaViaAlias.kt")
       public void testImportMemberFromJavaViaAlias() {
diff --git a/compiler/testData/diagnostics/tests/typealias/importFromTypeAliasExtendedInvokableObject.fir.kt b/compiler/testData/diagnostics/tests/typealias/importFromTypeAliasExtendedInvokableObject.fir.kt
new file mode 100644
index 00000000000..ad34c19c464
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/typealias/importFromTypeAliasExtendedInvokableObject.fir.kt
@@ -0,0 +1,15 @@
+// FILE: 1.kt
+package simpleObject
+
+typealias SimpleObject = TestCase
+
+object ExtendedInvokableObject
+
+operator fun ExtendedInvokableObject.invoke() {}
+
+object TestCase {
+    val extendedPropertyLikeClbl = ExtendedInvokableObject
+}
+
+// FILE: 2.kt
+import simpleObject.<!TYPEALIAS_AS_CALLABLE_QUALIFIER_IN_IMPORT_WARNING("SimpleObject; TestCase")!>SimpleObject<!>.extendedPropertyLikeClbl
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/typealias/importFromTypeAliasExtendedInvokableObject.kt b/compiler/testData/diagnostics/tests/typealias/importFromTypeAliasExtendedInvokableObject.kt
new file mode 100644
index 00000000000..9738e63c9a0
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/typealias/importFromTypeAliasExtendedInvokableObject.kt
@@ -0,0 +1,15 @@
+// FILE: 1.kt
+package simpleObject
+
+typealias SimpleObject = TestCase
+
+object ExtendedInvokableObject
+
+operator fun ExtendedInvokableObject.invoke() {}
+
+object TestCase {
+    val extendedPropertyLikeClbl = ExtendedInvokableObject
+}
+
+// FILE: 2.kt
+import simpleObject.SimpleObject.extendedPropertyLikeClbl
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/typealias/importFromTypeAliasFunctionReference.fir.kt b/compiler/testData/diagnostics/tests/typealias/importFromTypeAliasFunctionReference.fir.kt
new file mode 100644
index 00000000000..f3f3882040e
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/typealias/importFromTypeAliasFunctionReference.fir.kt
@@ -0,0 +1,13 @@
+// FILE: 1.kt
+package simpleObject
+
+typealias SimpleObject = TestCase
+
+fun foo() {}
+
+object TestCase {
+    val functionReference = ::foo
+}
+
+// FILE: 2.kt
+import simpleObject.<!TYPEALIAS_AS_CALLABLE_QUALIFIER_IN_IMPORT_WARNING("SimpleObject; TestCase")!>SimpleObject<!>.functionReference
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/typealias/importFromTypeAliasFunctionReference.kt b/compiler/testData/diagnostics/tests/typealias/importFromTypeAliasFunctionReference.kt
new file mode 100644
index 00000000000..c2ea601be6e
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/typealias/importFromTypeAliasFunctionReference.kt
@@ -0,0 +1,13 @@
+// FILE: 1.kt
+package simpleObject
+
+typealias SimpleObject = TestCase
+
+fun foo() {}
+
+object TestCase {
+    val functionReference = ::foo
+}
+
+// FILE: 2.kt
+import simpleObject.SimpleObject.functionReference
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/typealias/importFromTypeAliasInvokableObject.fir.kt b/compiler/testData/diagnostics/tests/typealias/importFromTypeAliasInvokableObject.fir.kt
new file mode 100644
index 00000000000..2e5f17963e8
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/typealias/importFromTypeAliasInvokableObject.fir.kt
@@ -0,0 +1,15 @@
+// FILE: 1.kt
+package simpleObject
+
+typealias SimpleObject = TestCase
+
+object InvokableObject {
+    operator fun invoke() {}
+}
+
+object TestCase {
+    val propertyLikeClbl = InvokableObject
+}
+
+// FILE: 2.kt
+import simpleObject.<!TYPEALIAS_AS_CALLABLE_QUALIFIER_IN_IMPORT_WARNING("SimpleObject; TestCase")!>SimpleObject<!>.propertyLikeClbl
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/typealias/importFromTypeAliasInvokableObject.kt b/compiler/testData/diagnostics/tests/typealias/importFromTypeAliasInvokableObject.kt
new file mode 100644
index 00000000000..803426712e1
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/typealias/importFromTypeAliasInvokableObject.kt
@@ -0,0 +1,15 @@
+// FILE: 1.kt
+package simpleObject
+
+typealias SimpleObject = TestCase
+
+object InvokableObject {
+    operator fun invoke() {}
+}
+
+object TestCase {
+    val propertyLikeClbl = InvokableObject
+}
+
+// FILE: 2.kt
+import simpleObject.SimpleObject.propertyLikeClbl
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/typealias/importFromTypeAliasNestedObjectFunMember.fir.kt b/compiler/testData/diagnostics/tests/typealias/importFromTypeAliasNestedObjectFunMember.fir.kt
new file mode 100644
index 00000000000..8e066c73791
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/typealias/importFromTypeAliasNestedObjectFunMember.fir.kt
@@ -0,0 +1,15 @@
+// FILE: 1.kt
+package objectInClass
+
+class Outer1 {
+    class Nested {
+        object Object {
+            fun clbl1() {}
+        }
+    }
+}
+
+typealias ObjectInNestedClass = Outer1.Nested.Object
+
+// FILE: 2.kt
+import objectInClass.<!TYPEALIAS_AS_CALLABLE_QUALIFIER_IN_IMPORT_WARNING("ObjectInNestedClass; Object")!>ObjectInNestedClass<!>.clbl1
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/typealias/importFromTypeAliasNestedObjectFunMember.kt b/compiler/testData/diagnostics/tests/typealias/importFromTypeAliasNestedObjectFunMember.kt
new file mode 100644
index 00000000000..a790085615b
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/typealias/importFromTypeAliasNestedObjectFunMember.kt
@@ -0,0 +1,15 @@
+// FILE: 1.kt
+package objectInClass
+
+class Outer1 {
+    class Nested {
+        object Object {
+            fun clbl1() {}
+        }
+    }
+}
+
+typealias ObjectInNestedClass = Outer1.Nested.Object
+
+// FILE: 2.kt
+import objectInClass.ObjectInNestedClass.clbl1
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/typealias/importFromTypeAliasObjectProperties.fir.kt b/compiler/testData/diagnostics/tests/typealias/importFromTypeAliasObjectProperties.fir.kt
new file mode 100644
index 00000000000..f61d30023c2
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/typealias/importFromTypeAliasObjectProperties.fir.kt
@@ -0,0 +1,11 @@
+// FILE: 1.kt
+package objectProperties
+
+typealias ObjectWithProps = A
+
+object A {
+    val a = 10
+}
+
+// FILE: 2.kt
+import objectProperties.<!TYPEALIAS_AS_CALLABLE_QUALIFIER_IN_IMPORT_WARNING("ObjectWithProps; A")!>ObjectWithProps<!>.a
diff --git a/compiler/testData/diagnostics/tests/typealias/importFromTypeAliasObjectProperties.kt b/compiler/testData/diagnostics/tests/typealias/importFromTypeAliasObjectProperties.kt
new file mode 100644
index 00000000000..0dcb0c39405
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/typealias/importFromTypeAliasObjectProperties.kt
@@ -0,0 +1,11 @@
+// FILE: 1.kt
+package objectProperties
+
+typealias ObjectWithProps = A
+
+object A {
+    val a = 10
+}
+
+// FILE: 2.kt
+import objectProperties.ObjectWithProps.a
\ No newline at end of file
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
index 3f3a18b36d0..561b6650b7a 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
@@ -39472,12 +39472,42 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
         runTest("compiler/testData/diagnostics/tests/typealias/importForTypealiasObject.kt");
       }
 
+      @Test
+      @TestMetadata("importFromTypeAliasExtendedInvokableObject.kt")
+      public void testImportFromTypeAliasExtendedInvokableObject() {
+        runTest("compiler/testData/diagnostics/tests/typealias/importFromTypeAliasExtendedInvokableObject.kt");
+      }
+
+      @Test
+      @TestMetadata("importFromTypeAliasFunctionReference.kt")
+      public void testImportFromTypeAliasFunctionReference() {
+        runTest("compiler/testData/diagnostics/tests/typealias/importFromTypeAliasFunctionReference.kt");
+      }
+
+      @Test
+      @TestMetadata("importFromTypeAliasInvokableObject.kt")
+      public void testImportFromTypeAliasInvokableObject() {
+        runTest("compiler/testData/diagnostics/tests/typealias/importFromTypeAliasInvokableObject.kt");
+      }
+
+      @Test
+      @TestMetadata("importFromTypeAliasNestedObjectFunMember.kt")
+      public void testImportFromTypeAliasNestedObjectFunMember() {
+        runTest("compiler/testData/diagnostics/tests/typealias/importFromTypeAliasNestedObjectFunMember.kt");
+      }
+
       @Test
       @TestMetadata("importFromTypeAliasObject.kt")
       public void testImportFromTypeAliasObject() {
         runTest("compiler/testData/diagnostics/tests/typealias/importFromTypeAliasObject.kt");
       }
 
+      @Test
+      @TestMetadata("importFromTypeAliasObjectProperties.kt")
+      public void testImportFromTypeAliasObjectProperties() {
+        runTest("compiler/testData/diagnostics/tests/typealias/importFromTypeAliasObjectProperties.kt");
+      }
+
       @Test
       @TestMetadata("importMemberFromJavaViaAlias.kt")
       public void testImportMemberFromJavaViaAlias() {