diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt
index 3e6a7d9b28c..b5b2ae6e4e8 100644
--- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt
+++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt
@@ -136,7 +136,7 @@ class JavaSymbolProvider(
     ) {
         require(this is FirTypeParameterImpl)
         for (upperBound in javaTypeParameter.upperBounds) {
-            bounds += upperBound.toFirResolvedTypeRef(this@JavaSymbolProvider.session, stack)
+            bounds += upperBound.toFirResolvedTypeRef(this@JavaSymbolProvider.session, stack, isNullable = true)
         }
         addDefaultBoundIfNecessary()
     }
diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt
index 5f9dd605d15..d0bb5e1e4a8 100644
--- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt
+++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt
@@ -93,9 +93,9 @@ internal fun JavaType.toFirJavaTypeRef(session: FirSession, javaTypeParameterSta
 }
 
 internal fun JavaClassifierType.toFirResolvedTypeRef(
-    session: FirSession, javaTypeParameterStack: JavaTypeParameterStack
+    session: FirSession, javaTypeParameterStack: JavaTypeParameterStack, isNullable: Boolean = false
 ): FirResolvedTypeRef {
-    val coneType = this.toConeKotlinTypeWithNullability(session, javaTypeParameterStack, isNullable = false)
+    val coneType = this.toConeKotlinTypeWithNullability(session, javaTypeParameterStack, isNullable)
     return FirResolvedTypeRefImpl(
         source = null, type = coneType
     ).apply {
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt
index ae67ea3b7ef..15ed3657b96 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt
@@ -1,4 +1,4 @@
-public final class ClassWithTypePP<P, Q : R|P|> : R|kotlin/Any| {
-    public constructor<P, Q : R|P|>(): R|test/ClassWithTypePP<P, Q>|
+public final class ClassWithTypePP<P, Q : R|P?|> : R|kotlin/Any| {
+    public constructor<P, Q : R|P?|>(): R|test/ClassWithTypePP<P, Q>|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt
index e36bdb46e5a..fe457de72a8 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt
@@ -1,4 +1,4 @@
-public open class ClassWithTypePRefNext<R : R|kotlin/collections/MutableIterable<P>|, P> : R|kotlin/Any| {
-    public constructor<R : R|kotlin/collections/MutableIterable<P>|, P>(): R|test/ClassWithTypePRefNext<R, P>|
+public open class ClassWithTypePRefNext<R : R|kotlin/collections/MutableIterable<P>?|, P> : R|kotlin/Any| {
+    public constructor<R : R|kotlin/collections/MutableIterable<P>?|, P>(): R|test/ClassWithTypePRefNext<R, P>|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt
index af1f1138354..7eeb04402d4 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt
@@ -1,4 +1,4 @@
-public final class ClassWithTypePRefSelf<P : R|kotlin/Enum<P>|> : R|kotlin/Any| {
-    public constructor<P : R|kotlin/Enum<P>|>(): R|test/ClassWithTypePRefSelf<P>|
+public final class ClassWithTypePRefSelf<P : R|kotlin/Enum<P>?|> : R|kotlin/Any| {
+    public constructor<P : R|kotlin/Enum<P>?|>(): R|test/ClassWithTypePRefSelf<P>|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt
index 46cb7f3a7d5..9ca97119335 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt
@@ -1,4 +1,4 @@
-public final class ClassWithTypePRefSelfAndClass<P : R|test/ClassWithTypePRefSelfAndClass<P>|> : R|kotlin/Any| {
-    public constructor<P : R|test/ClassWithTypePRefSelfAndClass<P>|>(): R|test/ClassWithTypePRefSelfAndClass<P>|
+public final class ClassWithTypePRefSelfAndClass<P : R|test/ClassWithTypePRefSelfAndClass<P>?|> : R|kotlin/Any| {
+    public constructor<P : R|test/ClassWithTypePRefSelfAndClass<P>?|>(): R|test/ClassWithTypePRefSelfAndClass<P>|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt
index 2bb1ef113c2..dc5f00f442e 100644
--- a/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt
@@ -1,5 +1,5 @@
 public open class MethodTypePOneUpperBound : R|kotlin/Any| {
-    public open operator fun <T : R|kotlin/Cloneable|> bar(): R|kotlin/Unit|
+    public open operator fun <T : R|kotlin/Cloneable?|> bar(): R|kotlin/Unit|
 
     public constructor(): R|test/MethodTypePOneUpperBound|
 
diff --git a/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt b/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt
index 07b0b89ada3..6a47cf7d958 100644
--- a/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt
@@ -1,5 +1,5 @@
 public open class MethodTypePTwoUpperBounds : R|kotlin/Any| {
-    public open operator fun <T : R|kotlin/Cloneable|, R|java/lang/Runnable|> foo(): R|kotlin/Unit|
+    public open operator fun <T : R|kotlin/Cloneable?|, R|java/lang/Runnable?|> foo(): R|kotlin/Unit|
 
     public constructor(): R|test/MethodTypePTwoUpperBounds|
 
diff --git a/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt
index 4b0f823d5e1..db2b86e8f08 100644
--- a/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt
@@ -1,5 +1,5 @@
 public final class MethodWithTypePP : R|kotlin/Any| {
-    public final operator fun <P, Q : R|P|> f(): R|kotlin/Unit|
+    public final operator fun <P, Q : R|P?|> f(): R|kotlin/Unit|
 
     public constructor(): R|test/MethodWithTypePP|
 
diff --git a/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt
index ec77d8fe1c2..a359b727382 100644
--- a/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt
@@ -1,5 +1,5 @@
 public open class MethodWithTypePRefClassP<P> : R|kotlin/Any| {
-    public final operator fun <Q : R|P|> f(): R|kotlin/Unit|
+    public final operator fun <Q : R|P?|> f(): R|kotlin/Unit|
 
     public constructor<P>(): R|test/MethodWithTypePRefClassP<P>|
 
diff --git a/compiler/testData/loadJava/compiledJava/RawUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/RawUpperBound.fir.txt
index 2fa45c790db..17f6b19a2dd 100644
--- a/compiler/testData/loadJava/compiledJava/RawUpperBound.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/RawUpperBound.fir.txt
@@ -1,2 +1,2 @@
-public abstract interface RawUpperBound<T : R|test/RawUpperBound<*>|> : R|kotlin/Any| {
+public abstract interface RawUpperBound<T : R|test/RawUpperBound<*>?|> : R|kotlin/Any| {
 }
diff --git a/compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.fir.txt
index e2cffc65849..84d2145318e 100644
--- a/compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.fir.txt
@@ -1,2 +1,2 @@
-public abstract interface RecursiveRawUpperBound<T : R|test/RecursiveRawUpperBound<*>|> : R|kotlin/Any| {
+public abstract interface RecursiveRawUpperBound<T : R|test/RecursiveRawUpperBound<*>?|> : R|kotlin/Any| {
 }
diff --git a/compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.fir.txt
index 6e3d3b70fe1..ea2b10bbe08 100644
--- a/compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.fir.txt
@@ -1,2 +1,2 @@
-public abstract interface RecursiveWildcardUpperBound<T : R|test/RecursiveWildcardUpperBound<*>|> : R|kotlin/Any| {
+public abstract interface RecursiveWildcardUpperBound<T : R|test/RecursiveWildcardUpperBound<*>?|> : R|kotlin/Any| {
 }
diff --git a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.fir.txt
index f8ffe9294a1..41a6147a0c6 100644
--- a/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.fir.txt
@@ -1,4 +1,4 @@
 public open class ConstructorGenericUpperBound : R|kotlin/Any| {
-    public constructor<P : R|java/util/RandomAccess|>(p: R|ft<P, P?>!|): R|test/ConstructorGenericUpperBound|
+    public constructor<P : R|java/util/RandomAccess?|>(p: R|ft<P, P?>!|): R|test/ConstructorGenericUpperBound|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt
index 9b0bcf905f5..02ed41f8f28 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt
@@ -1,5 +1,5 @@
 public open class AllBoundsInWhen : R|kotlin/Any| {
-    public open operator fun <T : R|java/io/Serializable|> foo(): R|kotlin/Unit|
+    public open operator fun <T : R|java/io/Serializable?|> foo(): R|kotlin/Unit|
 
     public constructor(): R|test/AllBoundsInWhen|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt
index be91524e238..5b03c145dfc 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt
@@ -1,5 +1,5 @@
 public open class MethodWithTypeParameters : R|kotlin/Any| {
-    public open operator fun <A, B : R|java/lang/Runnable|, R|kotlin/collections/MutableList<kotlin/Cloneable>|> foo(a: R|ft<A, A?>!|, b: R|ft<kotlin/collections/MutableList<out B>, kotlin/collections/List<out B>?>!|, list: R|ft<kotlin/collections/MutableList<in kotlin/String>, kotlin/collections/List<in kotlin/String>?>!|): R|kotlin/Unit|
+    public open operator fun <A, B : R|java/lang/Runnable?|, R|kotlin/collections/MutableList<kotlin/Cloneable>?|> foo(a: R|ft<A, A?>!|, b: R|ft<kotlin/collections/MutableList<out B>, kotlin/collections/List<out B>?>!|, list: R|ft<kotlin/collections/MutableList<in kotlin/String>, kotlin/collections/List<in kotlin/String>?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/MethodWithTypeParameters|
 
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt
index f0e900e28ad..80f11a712dc 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt
@@ -1,5 +1,5 @@
 public open class WrongTypeParameterBoundStructure1 : R|kotlin/Any| {
-    public open operator fun <A, B : R|java/lang/Runnable|, R|kotlin/collections/MutableList<kotlin/Cloneable>|> foo(a: R|ft<A, A?>!|, b: R|ft<kotlin/collections/MutableList<out B>, kotlin/collections/List<out B>?>!|): R|kotlin/Unit|
+    public open operator fun <A, B : R|java/lang/Runnable?|, R|kotlin/collections/MutableList<kotlin/Cloneable>?|> foo(a: R|ft<A, A?>!|, b: R|ft<kotlin/collections/MutableList<out B>, kotlin/collections/List<out B>?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/WrongTypeParameterBoundStructure1|
 
diff --git a/compiler/testData/loadJava/compiledJava/library/Max.fir.txt b/compiler/testData/loadJava/compiledJava/library/Max.fir.txt
index 02b6a65ac46..bfb618ba7d0 100644
--- a/compiler/testData/loadJava/compiledJava/library/Max.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/library/Max.fir.txt
@@ -1,5 +1,5 @@
 public open class Max : R|kotlin/Any| {
-    public open operator fun <T : R|kotlin/Any|, R|kotlin/Comparable<in T>|> max(coll: R|ft<kotlin/collections/MutableCollection<out T>, kotlin/collections/Collection<out T>?>!|): R|ft<T, T?>!|
+    public open operator fun <T : R|kotlin/Comparable<in T>?|> max(coll: R|ft<kotlin/collections/MutableCollection<out T>, kotlin/collections/Collection<out T>?>!|): R|ft<T, T?>!|
 
     public constructor(): R|test/Max|
 
diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt
index eedcc50a97c..b968aaad7d0 100644
--- a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt
@@ -1,4 +1,4 @@
-public abstract interface GenericInterfaceParameterWithSelfBound<T : R|test/GenericInterfaceParameterWithSelfBound<T>|> : R|kotlin/Any| {
+public abstract interface GenericInterfaceParameterWithSelfBound<T : R|test/GenericInterfaceParameterWithSelfBound<T>?|> : R|kotlin/Any| {
     public abstract operator fun method(t: R|ft<T, T?>!|): R|ft<T, T?>!|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt
index 38c3e289862..94133370a78 100644
--- a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt
@@ -1,4 +1,4 @@
-public abstract interface GenericInterfaceParametersWithBounds<A : R|kotlin/Comparable<A>|, R|kotlin/Cloneable|, B : R|kotlin/collections/MutableList<A>|> : R|kotlin/Any| {
+public abstract interface GenericInterfaceParametersWithBounds<A : R|kotlin/Comparable<A>?|, R|kotlin/Cloneable?|, B : R|kotlin/collections/MutableList<A>?|> : R|kotlin/Any| {
     public abstract operator fun method(a: R|kotlin/Array<ft<A, A?>!>|, b: R|ft<B, B?>!|): R|kotlin/Unit|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt
index 6b48ed17ac1..8720bdb3319 100644
--- a/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt
@@ -1,4 +1,4 @@
 public abstract interface GenericMethodParameters : R|kotlin/Any| {
-    public abstract operator fun <A : R|kotlin/CharSequence|, B : R|kotlin/collections/MutableList<A>|> method(a: R|kotlin/Array<ft<A, A?>!>|, b: R|ft<B, B?>!|): R|kotlin/Unit|
+    public abstract operator fun <A : R|kotlin/CharSequence?|, B : R|kotlin/collections/MutableList<A>?|> method(a: R|kotlin/Array<ft<A, A?>!>|, b: R|ft<B, B?>!|): R|kotlin/Unit|
 
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt
index 176829206fc..c1fdc383d79 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt
@@ -1,9 +1,9 @@
 public open class TypeParameterOfMethod : R|kotlin/Any| {
     public open static operator fun <T> max(comparator: R|ft<java/util/Comparator<ft<T, T?>!>, java/util/Comparator<ft<T, T?>!>?>!|, value1: R|ft<T, T?>!|, value2: R|ft<T, T?>!|): R|ft<T, T?>!|
 
-    public open static operator fun <T : R|kotlin/CharSequence|> max2(comparator: R|ft<java/util/Comparator<ft<T, T?>!>, java/util/Comparator<ft<T, T?>!>?>!|, value1: R|ft<T, T?>!|, value2: R|ft<T, T?>!|): R|ft<T, T?>!|
+    public open static operator fun <T : R|kotlin/CharSequence?|> max2(comparator: R|ft<java/util/Comparator<ft<T, T?>!>, java/util/Comparator<ft<T, T?>!>?>!|, value1: R|ft<T, T?>!|, value2: R|ft<T, T?>!|): R|ft<T, T?>!|
 
-    public open static operator fun <A : R|kotlin/CharSequence|, B : R|kotlin/collections/MutableList<A>|> method(a: R|ft<java/util/Comparator<ft<A, A?>!>, java/util/Comparator<ft<A, A?>!>?>!|, b: R|ft<B, B?>!|): R|kotlin/Unit|
+    public open static operator fun <A : R|kotlin/CharSequence?|, B : R|kotlin/collections/MutableList<A>?|> method(a: R|ft<java/util/Comparator<ft<A, A?>!>, java/util/Comparator<ft<A, A?>!>?>!|, b: R|ft<B, B?>!|): R|kotlin/Unit|
 
     public constructor(): R|test/TypeParameterOfMethod|