diff --git a/java/java-backend/resources/META-INF/JavaPlugin.xml b/java/java-backend/resources/META-INF/JavaPlugin.xml
index c22497f28a70..0ec8ea839511 100644
--- a/java/java-backend/resources/META-INF/JavaPlugin.xml
+++ b/java/java-backend/resources/META-INF/JavaPlugin.xml
@@ -1155,7 +1155,6 @@
     <codeInsight.completion.command.provider language="JAVA" implementationClass="com.intellij.codeInsight.completion.commands.impl.JavaGenerateConstructorCompletionCommandProvider" order="last"/>
     <codeInsight.completion.command.provider language="JAVA" implementationClass="com.intellij.codeInsight.completion.commands.impl.JavaSurroundWithCompletionCommandProvider" order="last"/>
     <codeInsight.completion.command.provider language="JAVA" implementationClass="com.intellij.codeInsight.completion.commands.impl.JavaSafeDeleteCompletionCommandProvider" order="last"/>
-    <codeInsight.completion.command.provider language="JAVA" implementationClass="com.intellij.platform.structureView.backend.completion.commands.ViewStructureCompletionCommandProvider" order="last"/>
     <codeInsight.completion.command.provider language="JAVA" implementationClass="com.intellij.codeInsight.completion.commands.impl.JavaParameterInfoCompletionCommand" order="last"/>
     <codeInsight.completion.command.provider language="JAVA" implementationClass="com.intellij.codeInsight.completion.command.commands.InsertLiveTemplateCompletionCommandProvider" order="last"/>
 
diff --git a/platform/smRunner/resources/intellij.platform.smRunner.xml b/platform/smRunner/resources/intellij.platform.smRunner.xml
index e806567bbaab..274b501f57de 100644
--- a/platform/smRunner/resources/intellij.platform.smRunner.xml
+++ b/platform/smRunner/resources/intellij.platform.smRunner.xml
@@ -23,7 +23,7 @@
   <!-- endregion -->
 
   <extensionPoints>
-    <extensionPoint name="importTestOutput" interface="com.intellij.execution.testframework.sm.runner.history.ImportTestOutputExtension" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.importTestOutput" interface="com.intellij.execution.testframework.sm.runner.history.ImportTestOutputExtension" dynamic="true"/>
   </extensionPoints>
   <extensions defaultExtensionNs="com.intellij">
     <registryKey defaultValue="255" 
diff --git a/platform/structure-view-impl/backend/resources/intellij.platform.structureView.backend.xml b/platform/structure-view-impl/backend/resources/intellij.platform.structureView.backend.xml
index e45677dd986e..147e1844f698 100644
--- a/platform/structure-view-impl/backend/resources/intellij.platform.structureView.backend.xml
+++ b/platform/structure-view-impl/backend/resources/intellij.platform.structureView.backend.xml
@@ -25,5 +25,6 @@
   <extensions defaultExtensionNs="com.intellij">
     <platform.rpc.backend.remoteApiProvider implementation="com.intellij.platform.structureView.backend.StructureTreeApiProvider"/>
     <applicationService serviceImplementation="com.intellij.platform.structureView.backend.BackendStructureTreeService" client="all"/>
+    <codeInsight.completion.command.provider language="JAVA" implementationClass="com.intellij.platform.structureView.backend.completion.commands.ViewStructureCompletionCommandProvider" order="last"/>
   </extensions>
 </idea-plugin>
\ No newline at end of file
diff --git a/plugins/gradle/BUILD.bazel b/plugins/gradle/BUILD.bazel
index 2e7e35eea16e..e4c3a9a64b7e 100644
--- a/plugins/gradle/BUILD.bazel
+++ b/plugins/gradle/BUILD.bazel
@@ -232,6 +232,7 @@ jvm_library(
   srcs = glob([], allow_empty = True),
   exports = ["//platform/external-system-api/testFramework"],
   runtime_deps = [
+    "//platform/libraries/cglib",
     "//platform/backend/workspace",
     "//platform/external-system-api/dependency-updater",
     "//platform/observable",
@@ -391,6 +392,7 @@ jvm_library(
   ],
   runtime_deps = [
     ":gradle-tests",
+    "//platform/libraries/cglib:cglib_test_lib",
     "//platform/observable:observable_test_lib",
     "//platform/platform-util-io:ide-util-io_test_lib",
     "//platform/ide-core:ide-core_test_lib",
diff --git a/plugins/gradle/intellij.gradle.tests.iml b/plugins/gradle/intellij.gradle.tests.iml
index 59fe65ac6032..b3e81ab49f77 100644
--- a/plugins/gradle/intellij.gradle.tests.iml
+++ b/plugins/gradle/intellij.gradle.tests.iml
@@ -16,6 +16,7 @@
     <orderEntry type="library" scope="TEST" name="jmock" level="project" />
     <orderEntry type="library" scope="TEST" name="jmock.junit4" level="project" />
     <orderEntry type="library" scope="TEST" name="jmock.legacy" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.cglib" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.libraries.mockito" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="mockito-kotlin" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
diff --git a/plugins/maven/BUILD.bazel b/plugins/maven/BUILD.bazel
index 005f244202f5..a0c1bdc9ce37 100644
--- a/plugins/maven/BUILD.bazel
+++ b/plugins/maven/BUILD.bazel
@@ -127,7 +127,8 @@ jvm_library(
     "//platform/forms_rt:java-guiForms-rt",
     "//platform/external-system-api:externalSystem",
     "//platform/external-system-impl:externalSystem-impl",
-  ]
+  ],
+  runtime_deps = ["//java/xml.dom.impl"]
 )
 
 jvm_library(
@@ -179,6 +180,7 @@ jvm_library(
     "//jps/model-api:model_test_lib",
     "//platform/lang-api:lang_test_lib",
     "//java/java-impl:impl_test_lib",
+    "//java/xml.dom.impl:xml.dom.impl_test_lib",
     "//platform/lang-core:lang-core_test_lib",
     "//platform/macro:macro_test_lib",
     "//platform/projectModel-api:projectModel_test_lib",
diff --git a/plugins/maven/intellij.maven.iml b/plugins/maven/intellij.maven.iml
index 614cef26ff59..36c460dc9cee 100644
--- a/plugins/maven/intellij.maven.iml
+++ b/plugins/maven/intellij.maven.iml
@@ -25,6 +25,7 @@
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.java.impl" />
+    <orderEntry type="module" module-name="intellij.java.xml.dom.impl" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.lang.core" />
     <orderEntry type="module" module-name="intellij.platform.macro" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
diff --git a/plugins/maven/src/main/resources/intellij.maven.xml b/plugins/maven/src/main/resources/intellij.maven.xml
index a80eeb9d9bb7..30d317ac154e 100644
--- a/plugins/maven/src/main/resources/intellij.maven.xml
+++ b/plugins/maven/src/main/resources/intellij.maven.xml
@@ -11,6 +11,7 @@
     <module name="intellij.java.execution"/>
     <module name="intellij.java.execution.impl"/>
     <module name="intellij.java.impl"/>
+    <module name="intellij.java.xml.dom.impl"/>
     <module name="intellij.java.psi"/>
     <module name="intellij.java.syntax"/>
     <module name="intellij.java.ui"/>
diff --git a/plugins/stream-debugger/resources/META-INF/plugin.xml b/plugins/stream-debugger/resources/META-INF/plugin.xml
index 05317a7aa15b..ce87891b4986 100644
--- a/plugins/stream-debugger/resources/META-INF/plugin.xml
+++ b/plugins/stream-debugger/resources/META-INF/plugin.xml
@@ -6,7 +6,6 @@
   <content namespace="jetbrains">
     <module name="intellij.debugger.streams.core" loading="required"/>
     <module name="intellij.debugger.streams.shared" loading="required"/>
-    <module name="intellij.java.debugger.impl"/>
     <module name="intellij.debugger.streams.backend"/>
     <module name="intellij.debugger.streams.java" loading="optional"/>
   </content>