diff --git a/.idea/libraries/rhizomedb_compiler_plugin.xml b/.idea/libraries/rhizomedb_compiler_plugin.xml
index 5ea3a44939df..d115019b719f 100644
--- a/.idea/libraries/rhizomedb_compiler_plugin.xml
+++ b/.idea/libraries/rhizomedb_compiler_plugin.xml
@@ -1,18 +1,18 @@
 <component name="libraryTable">
   <library name="rhizomedb-compiler-plugin" type="repository">
-    <properties include-transitive-deps="false" maven-id="jetbrains.fleet:rhizomedb-compiler-plugin:2.0.20-0.1">
+    <properties include-transitive-deps="false" maven-id="jetbrains.fleet:rhizomedb-compiler-plugin:2.0.20-0.2">
       <verification>
-        <artifact url="file://$MAVEN_REPOSITORY$/jetbrains/fleet/rhizomedb-compiler-plugin/2.0.20-0.1/rhizomedb-compiler-plugin-2.0.20-0.1.jar">
-          <sha256sum>f0fb471b0c0d65398186a77a8854cb421ccc53b643b6033cdd3657b7efb61394</sha256sum>
+        <artifact url="file://$MAVEN_REPOSITORY$/jetbrains/fleet/rhizomedb-compiler-plugin/2.0.20-0.2/rhizomedb-compiler-plugin-2.0.20-0.2.jar">
+          <sha256sum>d62f7602160c0ca439a03e142b7c119f0b9abbcdeed3dfd388bc6f1c77e31909</sha256sum>
         </artifact>
       </verification>
     </properties>
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/jetbrains/fleet/rhizomedb-compiler-plugin/2.0.20-0.1/rhizomedb-compiler-plugin-2.0.20-0.1.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/jetbrains/fleet/rhizomedb-compiler-plugin/2.0.20-0.2/rhizomedb-compiler-plugin-2.0.20-0.2.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/jetbrains/fleet/rhizomedb-compiler-plugin/2.0.20-0.1/rhizomedb-compiler-plugin-2.0.20-0.1-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/jetbrains/fleet/rhizomedb-compiler-plugin/2.0.20-0.2/rhizomedb-compiler-plugin-2.0.20-0.2-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/rpc_compiler_plugin.xml b/.idea/libraries/rpc_compiler_plugin.xml
index 4d0b47d37f4e..218b643a3064 100644
--- a/.idea/libraries/rpc_compiler_plugin.xml
+++ b/.idea/libraries/rpc_compiler_plugin.xml
@@ -1,18 +1,18 @@
 <component name="libraryTable">
   <library name="rpc-compiler-plugin" type="repository">
-    <properties include-transitive-deps="false" maven-id="com.jetbrains.fleet:rpc-compiler-plugin:2.0.20-0.1">
+    <properties include-transitive-deps="false" maven-id="com.jetbrains.fleet:rpc-compiler-plugin:2.0.20-0.2">
       <verification>
-        <artifact url="file://$MAVEN_REPOSITORY$/com/jetbrains/fleet/rpc-compiler-plugin/2.0.20-0.1/rpc-compiler-plugin-2.0.20-0.1.jar">
-          <sha256sum>e0d660aa29c501e69f4141b94a5ad579e94e7d9a889769816a61021e94252846</sha256sum>
+        <artifact url="file://$MAVEN_REPOSITORY$/com/jetbrains/fleet/rpc-compiler-plugin/2.0.20-0.2/rpc-compiler-plugin-2.0.20-0.2.jar">
+          <sha256sum>2da8d727ee4e77856116c77d2b57c091d22e44948c882949d724c322d2f1a73c</sha256sum>
         </artifact>
       </verification>
     </properties>
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/jetbrains/fleet/rpc-compiler-plugin/2.0.20-0.1/rpc-compiler-plugin-2.0.20-0.1.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/jetbrains/fleet/rpc-compiler-plugin/2.0.20-0.2/rpc-compiler-plugin-2.0.20-0.2.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/jetbrains/fleet/rpc-compiler-plugin/2.0.20-0.1/rpc-compiler-plugin-2.0.20-0.1-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/jetbrains/fleet/rpc-compiler-plugin/2.0.20-0.2/rpc-compiler-plugin-2.0.20-0.2-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/fleet/kernel/fleet.kernel.iml b/fleet/kernel/fleet.kernel.iml
index 60920b8166ad..b5948c508269 100644
--- a/fleet/kernel/fleet.kernel.iml
+++ b/fleet/kernel/fleet.kernel.iml
@@ -16,8 +16,8 @@
             <arrayArg name="pluginClasspaths">
               <args>
                 <arg>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</arg>
-                <arg>$MAVEN_REPOSITORY$/jetbrains/fleet/rhizomedb-compiler-plugin/2.0.20-0.1/rhizomedb-compiler-plugin-2.0.20-0.1.jar</arg>
-                <arg>$MAVEN_REPOSITORY$/com/jetbrains/fleet/rpc-compiler-plugin/2.0.20-0.1/rpc-compiler-plugin-2.0.20-0.1.jar</arg>
+                <arg>$MAVEN_REPOSITORY$/jetbrains/fleet/rhizomedb-compiler-plugin/2.0.20-0.2/rhizomedb-compiler-plugin-2.0.20-0.2.jar</arg>
+                <arg>$MAVEN_REPOSITORY$/com/jetbrains/fleet/rpc-compiler-plugin/2.0.20-0.2/rpc-compiler-plugin-2.0.20-0.2.jar</arg>
               </args>
             </arrayArg>
             <arrayArg name="pluginOptions" />
diff --git a/fleet/rpc/fleet.rpc.iml b/fleet/rpc/fleet.rpc.iml
index 80ab4923fc6a..1a5ac20338bd 100644
--- a/fleet/rpc/fleet.rpc.iml
+++ b/fleet/rpc/fleet.rpc.iml
@@ -16,7 +16,7 @@
             <arrayArg name="pluginClasspaths">
               <args>
                 <arg>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</arg>
-                <arg>$MAVEN_REPOSITORY$/com/jetbrains/fleet/rpc-compiler-plugin/2.0.20-0.1/rpc-compiler-plugin-2.0.20-0.1.jar</arg>
+                <arg>$MAVEN_REPOSITORY$/com/jetbrains/fleet/rpc-compiler-plugin/2.0.20-0.2/rpc-compiler-plugin-2.0.20-0.2.jar</arg>
               </args>
             </arrayArg>
             <arrayArg name="pluginOptions" />
diff --git a/platform/kernel/backend/intellij.platform.kernel.backend.iml b/platform/kernel/backend/intellij.platform.kernel.backend.iml
index 17bddf90409b..6dfe7db9782c 100644
--- a/platform/kernel/backend/intellij.platform.kernel.backend.iml
+++ b/platform/kernel/backend/intellij.platform.kernel.backend.iml
@@ -14,7 +14,7 @@
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
-              <args>$MAVEN_REPOSITORY$/com/jetbrains/fleet/rpc-compiler-plugin/2.0.20-0.1/rpc-compiler-plugin-2.0.20-0.1.jar</args>
+              <args>$MAVEN_REPOSITORY$/com/jetbrains/fleet/rpc-compiler-plugin/2.0.20-0.2/rpc-compiler-plugin-2.0.20-0.2.jar</args>
             </arrayArg>
             <arrayArg name="pluginOptions" />
           </arrayArguments>
diff --git a/platform/kernel/shared/intellij.platform.kernel.iml b/platform/kernel/shared/intellij.platform.kernel.iml
index 1c398e8178e4..e94921603127 100644
--- a/platform/kernel/shared/intellij.platform.kernel.iml
+++ b/platform/kernel/shared/intellij.platform.kernel.iml
@@ -15,7 +15,7 @@
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
               <args>
-                <arg>$MAVEN_REPOSITORY$/jetbrains/fleet/rhizomedb-compiler-plugin/2.0.20-0.1/rhizomedb-compiler-plugin-2.0.20-0.1.jar</arg>
+                <arg>$MAVEN_REPOSITORY$/jetbrains/fleet/rhizomedb-compiler-plugin/2.0.20-0.2/rhizomedb-compiler-plugin-2.0.20-0.2.jar</arg>
               </args>
             </arrayArg>
             <arrayArg name="pluginOptions" />
diff --git a/platform/xdebugger-impl/api-dump-unreviewed.txt b/platform/xdebugger-impl/api-dump-unreviewed.txt
index 38cec9b3e145..1d04f7030bd8 100644
--- a/platform/xdebugger-impl/api-dump-unreviewed.txt
+++ b/platform/xdebugger-impl/api-dump-unreviewed.txt
@@ -1519,15 +1519,6 @@ f:com.intellij.xdebugger.impl.pinned.items.actions.XDebuggerPinToTopAction
 - update(com.intellij.openapi.actionSystem.AnActionEvent):V
 f:com.intellij.xdebugger.impl.pinned.items.actions.XDebuggerPinToTopAction$Companion
 - f:pinToTopField(java.awt.event.MouseEvent,com.intellij.xdebugger.impl.ui.tree.nodes.XValueNodeImpl):V
-f:com.intellij.xdebugger.impl.rpc.XDebuggerValueLookupHintsRemoteApiClientStub
-- fleet.rpc.RemoteApi
-- <init>(kotlin.jvm.functions.Function3):V
-- f:canShowHint(com.intellij.platform.project.ProjectId,com.intellij.openapi.editor.impl.EditorId,I,com.intellij.xdebugger.impl.evaluate.quick.common.ValueHintType,kotlin.coroutines.Continuation):java.lang.Object
-- f:createHint(com.intellij.platform.project.ProjectId,com.intellij.openapi.editor.impl.EditorId,I,com.intellij.xdebugger.impl.evaluate.quick.common.ValueHintType,kotlin.coroutines.Continuation):java.lang.Object
-- f:getExpressionInfo(com.intellij.platform.project.ProjectId,com.intellij.openapi.editor.impl.EditorId,I,com.intellij.xdebugger.impl.evaluate.quick.common.ValueHintType,kotlin.coroutines.Continuation):java.lang.Object
-- f:getInvocationHandler():kotlin.jvm.functions.Function3
-- f:removeHint(com.intellij.platform.project.ProjectId,I,kotlin.coroutines.Continuation):java.lang.Object
-- f:showHint(com.intellij.platform.project.ProjectId,I,kotlin.coroutines.Continuation):java.lang.Object
 f:com.intellij.xdebugger.impl.rpc.XDebuggerValueLookupHintsRemoteApiRemoteApiDescriptorImpl
 - fleet.rpc.RemoteApiDescriptor
 - sf:INSTANCE:com.intellij.xdebugger.impl.rpc.XDebuggerValueLookupHintsRemoteApiRemoteApiDescriptorImpl
diff --git a/platform/xdebugger-impl/backend/intellij.platform.debugger.impl.backend.iml b/platform/xdebugger-impl/backend/intellij.platform.debugger.impl.backend.iml
index 06f53348c5c0..2552de4e4482 100644
--- a/platform/xdebugger-impl/backend/intellij.platform.debugger.impl.backend.iml
+++ b/platform/xdebugger-impl/backend/intellij.platform.debugger.impl.backend.iml
@@ -16,8 +16,8 @@
             <arrayArg name="pluginClasspaths">
               <args>
                 <arg>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</arg>
-                <arg>$MAVEN_REPOSITORY$/jetbrains/fleet/rhizomedb-compiler-plugin/2.0.20-0.1/rhizomedb-compiler-plugin-2.0.20-0.1.jar</arg>
-                <arg>$MAVEN_REPOSITORY$/com/jetbrains/fleet/rpc-compiler-plugin/2.0.20-0.1/rpc-compiler-plugin-2.0.20-0.1.jar</arg>
+                <arg>$MAVEN_REPOSITORY$/jetbrains/fleet/rhizomedb-compiler-plugin/2.0.20-0.2/rhizomedb-compiler-plugin-2.0.20-0.2.jar</arg>
+                <arg>$MAVEN_REPOSITORY$/com/jetbrains/fleet/rpc-compiler-plugin/2.0.20-0.2/rpc-compiler-plugin-2.0.20-0.2.jar</arg>
               </args>
             </arrayArg>
             <arrayArg name="pluginOptions" />
diff --git a/platform/xdebugger-impl/exposed-private-api.txt b/platform/xdebugger-impl/exposed-private-api.txt
index fe07dbf2178a..f8145b32da2d 100644
--- a/platform/xdebugger-impl/exposed-private-api.txt
+++ b/platform/xdebugger-impl/exposed-private-api.txt
@@ -1,5 +1,3 @@
-com/intellij/openapi/editor/impl/EditorId
-com/intellij/platform/project/ProjectId
 com/intellij/xdebugger/impl/rpc/XDebuggerValueLookupHintsRemoteApi
 com/intellij/xdebugger/impl/ui/EmbeddedComboBoxUI
 com/intellij/xdebugger/memory/component/InstancesTracker$MyState
diff --git a/platform/xdebugger-impl/exposed-third-party-api.txt b/platform/xdebugger-impl/exposed-third-party-api.txt
index 582c3e72be6d..ef0d32779f3e 100644
--- a/platform/xdebugger-impl/exposed-third-party-api.txt
+++ b/platform/xdebugger-impl/exposed-third-party-api.txt
@@ -1,5 +1,4 @@
 com/jetbrains/rhizomedb/impl/EntityTypeProvider
-fleet/rpc/RemoteApi
 fleet/rpc/RemoteApiDescriptor
 fleet/rpc/RpcSignature
 kotlin/jvm/internal/DefaultConstructorMarker
diff --git a/platform/xdebugger-impl/frontend/intellij.platform.debugger.impl.frontend.iml b/platform/xdebugger-impl/frontend/intellij.platform.debugger.impl.frontend.iml
index 3925a167ca02..64195e452905 100644
--- a/platform/xdebugger-impl/frontend/intellij.platform.debugger.impl.frontend.iml
+++ b/platform/xdebugger-impl/frontend/intellij.platform.debugger.impl.frontend.iml
@@ -16,8 +16,8 @@
             <arrayArg name="pluginClasspaths">
               <args>
                 <arg>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</arg>
-                <arg>$MAVEN_REPOSITORY$/jetbrains/fleet/rhizomedb-compiler-plugin/2.0.20-0.1/rhizomedb-compiler-plugin-2.0.20-0.1.jar</arg>
-                <arg>$MAVEN_REPOSITORY$/com/jetbrains/fleet/rpc-compiler-plugin/2.0.20-0.1/rpc-compiler-plugin-2.0.20-0.1.jar</arg>
+                <arg>$MAVEN_REPOSITORY$/jetbrains/fleet/rhizomedb-compiler-plugin/2.0.20-0.2/rhizomedb-compiler-plugin-2.0.20-0.2.jar</arg>
+                <arg>$MAVEN_REPOSITORY$/com/jetbrains/fleet/rpc-compiler-plugin/2.0.20-0.2/rpc-compiler-plugin-2.0.20-0.2.jar</arg>
               </args>
             </arrayArg>
             <arrayArg name="pluginOptions" />
diff --git a/platform/xdebugger-impl/intellij.platform.debugger.impl.iml b/platform/xdebugger-impl/intellij.platform.debugger.impl.iml
index 4740c0ca3b9b..3a4c6ddca959 100644
--- a/platform/xdebugger-impl/intellij.platform.debugger.impl.iml
+++ b/platform/xdebugger-impl/intellij.platform.debugger.impl.iml
@@ -16,8 +16,8 @@
             <arrayArg name="pluginClasspaths">
               <args>
                 <arg>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</arg>
-                <arg>$MAVEN_REPOSITORY$/jetbrains/fleet/rhizomedb-compiler-plugin/2.0.20-0.1/rhizomedb-compiler-plugin-2.0.20-0.1.jar</arg>
-                <arg>$MAVEN_REPOSITORY$/com/jetbrains/fleet/rpc-compiler-plugin/2.0.20-0.1/rpc-compiler-plugin-2.0.20-0.1.jar</arg>
+                <arg>$MAVEN_REPOSITORY$/jetbrains/fleet/rhizomedb-compiler-plugin/2.0.20-0.2/rhizomedb-compiler-plugin-2.0.20-0.2.jar</arg>
+                <arg>$MAVEN_REPOSITORY$/com/jetbrains/fleet/rpc-compiler-plugin/2.0.20-0.2/rpc-compiler-plugin-2.0.20-0.2.jar</arg>
               </args>
             </arrayArg>
             <arrayArg name="pluginOptions" />