diff --git a/java/java-impl/resources/META-INF/JavaPlugin.xml b/java/java-impl/resources/META-INF/JavaPlugin.xml
index d3cb2ff0c4f8..317d86f84a2f 100644
--- a/java/java-impl/resources/META-INF/JavaPlugin.xml
+++ b/java/java-impl/resources/META-INF/JavaPlugin.xml
@@ -410,9 +410,9 @@
serviceImplementation="com.intellij.openapi.roots.impl.LanguageLevelProjectExtensionImpl"/>
-
-
@@ -451,7 +451,8 @@
serviceImplementation="com.intellij.facet.impl.ui.FacetEditorsStateManagerImpl"/>
+ serviceImplementation="com.intellij.openapi.projectRoots.impl.DefaultJdkConfiguratorImpl"
+ open="true"/>
diff --git a/java/java-psi-impl/resources/intellij.java.psi.impl.xml b/java/java-psi-impl/resources/intellij.java.psi.impl.xml
index f4f6b5a6859e..d3d940ed847f 100644
--- a/java/java-psi-impl/resources/intellij.java.psi.impl.xml
+++ b/java/java-psi-impl/resources/intellij.java.psi.impl.xml
@@ -79,9 +79,9 @@
serviceImplementation="com.intellij.codeInsight.TestFrameworksImpl"/>
-
-
-
+
diff --git a/platform/analysis-impl/resources/META-INF/AnalysisImpl.xml b/platform/analysis-impl/resources/META-INF/AnalysisImpl.xml
index 2949fc02af95..00e8dc8c0a5b 100644
--- a/platform/analysis-impl/resources/META-INF/AnalysisImpl.xml
+++ b/platform/analysis-impl/resources/META-INF/AnalysisImpl.xml
@@ -35,7 +35,7 @@
-
@@ -47,7 +47,7 @@
-
@@ -61,7 +61,7 @@
serviceImplementation="com.intellij.codeInsight.template.TemplateBuilderFactoryImpl"/>
-
-
-
-
+
-
-
-
diff --git a/platform/editor-ui-api/resources/META-INF/Editor.xml b/platform/editor-ui-api/resources/META-INF/Editor.xml
index c25c70472949..44eceae87b11 100644
--- a/platform/editor-ui-api/resources/META-INF/Editor.xml
+++ b/platform/editor-ui-api/resources/META-INF/Editor.xml
@@ -16,12 +16,12 @@
-
+
\ No newline at end of file
diff --git a/platform/execution-impl/resources/META-INF/PlatformExecutionActions.xml b/platform/execution-impl/resources/META-INF/PlatformExecutionActions.xml
index 1568c6bdac1c..997f46920f0c 100644
--- a/platform/execution-impl/resources/META-INF/PlatformExecutionActions.xml
+++ b/platform/execution-impl/resources/META-INF/PlatformExecutionActions.xml
@@ -78,7 +78,7 @@
-
diff --git a/platform/external-system-impl/resources/META-INF/ExternalSystemExtensions.xml b/platform/external-system-impl/resources/META-INF/ExternalSystemExtensions.xml
index 51d6bd2f98b9..0b3d8c7cf15c 100644
--- a/platform/external-system-impl/resources/META-INF/ExternalSystemExtensions.xml
+++ b/platform/external-system-impl/resources/META-INF/ExternalSystemExtensions.xml
@@ -32,7 +32,8 @@
+ serviceImplementation="com.intellij.openapi.externalSystem.autoimport.AutoImportProjectTracker"
+ open="true"/>
-
diff --git a/platform/feedback/resources/intellij.platform.feedback.xml b/platform/feedback/resources/intellij.platform.feedback.xml
index 6d78f9315333..9070979d3b8d 100644
--- a/platform/feedback/resources/intellij.platform.feedback.xml
+++ b/platform/feedback/resources/intellij.platform.feedback.xml
@@ -13,7 +13,7 @@
overrides="true"/>
-
+
diff --git a/platform/find/resources/intellij.platform.find.xml b/platform/find/resources/intellij.platform.find.xml
index bba2557cdaa4..d783a860770f 100644
--- a/platform/find/resources/intellij.platform.find.xml
+++ b/platform/find/resources/intellij.platform.find.xml
@@ -16,7 +16,7 @@
-
-
-
+
+
diff --git a/platform/ijent/resources/META-INF/IJent.xml b/platform/ijent/resources/META-INF/IJent.xml
index 6a5eef4df302..3f6ae1307763 100644
--- a/platform/ijent/resources/META-INF/IJent.xml
+++ b/platform/ijent/resources/META-INF/IJent.xml
@@ -6,11 +6,11 @@
diff --git a/platform/platform-resources/src/META-INF/LangExtensions.xml b/platform/platform-resources/src/META-INF/LangExtensions.xml
index 6a23b28cab11..a2fb1c43b9ad 100644
--- a/platform/platform-resources/src/META-INF/LangExtensions.xml
+++ b/platform/platform-resources/src/META-INF/LangExtensions.xml
@@ -40,7 +40,7 @@
-
+
@@ -58,12 +58,13 @@
+ serviceImplementation="com.intellij.psi.codeStyle.CodeStyleSettingsServiceImpl"
+ open="true"/>
-
+
@@ -136,7 +137,7 @@
-
+
@@ -145,7 +146,7 @@
-
+
-
+
-
-
-
@@ -228,7 +229,7 @@
-
-
-
+
-
-
+
@@ -299,7 +300,7 @@
-
@@ -308,10 +309,10 @@
serviceImplementation="com.intellij.codeInsight.daemon.impl.analysis.HighlightingSettingsPerFile"
preload="notHeadless"/>
-
+
-
-
+
+
@@ -321,22 +322,22 @@
-
-
-
-
+
@@ -358,16 +359,16 @@
serviceImplementation="com.intellij.codeInsight.highlighting.HighlightManagerImpl"/>
-
-
+
+
-
-
-
-
+
+
+
+
-
+
@@ -387,7 +388,7 @@
-
@@ -430,7 +431,7 @@
implementation="com.intellij.codeInsight.hints.declarative.impl.DeclarativeInlayHintsMouseMotionListener"/>
-
+
-
-
@@ -999,11 +1000,11 @@
-
-
-
@@ -1083,7 +1084,7 @@
-
+
@@ -1104,9 +1105,9 @@
-
+
-
+
@@ -1285,7 +1286,7 @@
-
@@ -1415,7 +1416,7 @@
-
@@ -1520,7 +1521,7 @@
-
@@ -1528,7 +1529,8 @@
serviceImplementation="com.intellij.codeInsight.daemon.impl.LazyQuickFixUpdaterImpl"/>
-
+
-
-
+
diff --git a/platform/platform-resources/src/META-INF/PlatformExecutionExtensions.xml b/platform/platform-resources/src/META-INF/PlatformExecutionExtensions.xml
index d4f91b08cb14..71811c70e5bb 100644
--- a/platform/platform-resources/src/META-INF/PlatformExecutionExtensions.xml
+++ b/platform/platform-resources/src/META-INF/PlatformExecutionExtensions.xml
@@ -7,7 +7,7 @@
-
@@ -47,7 +47,7 @@
-
@@ -58,9 +58,9 @@
-
-
@@ -86,7 +86,7 @@
-
+
diff --git a/platform/platform-resources/src/META-INF/PlatformExtensions.xml b/platform/platform-resources/src/META-INF/PlatformExtensions.xml
index a61289f89b79..21185f4d32a6 100644
--- a/platform/platform-resources/src/META-INF/PlatformExtensions.xml
+++ b/platform/platform-resources/src/META-INF/PlatformExtensions.xml
@@ -79,10 +79,10 @@
-
-
-
-
@@ -122,7 +122,7 @@
-
@@ -139,7 +139,7 @@
-
@@ -152,8 +152,8 @@
-
-
+
@@ -167,7 +167,7 @@
-
@@ -201,9 +201,9 @@
-
-
@@ -222,17 +222,17 @@
-
-
-
-
-
-
-
@@ -280,12 +280,12 @@
-
-
-
-
-
+
@@ -314,13 +314,13 @@
-
-
@@ -335,7 +335,7 @@
@@ -353,7 +353,7 @@
os="linux"
preload="notHeadless"/>
-
@@ -461,7 +461,7 @@
serviceImplementation="com.intellij.ui.SystemNotificationsImpl"/>
-
-
-
-
+
-
+
-
+
-
+
@@ -505,11 +505,11 @@
-
+
-
-
+
-
-
+ serviceImplementation="com.intellij.diagnostic.EventWatcherService" headlessImplementation=""
+ open="true"/>
-
@@ -667,7 +668,7 @@
serviceImplementation="com.intellij.openapi.options.advanced.AdvancedSettingsImpl"/>
-
+
@@ -724,10 +725,10 @@
-
-
+
-
-
+
-
@@ -966,7 +967,7 @@
-
@@ -1252,15 +1253,15 @@
-
-
-
@@ -1301,7 +1302,7 @@
-
+
@@ -1312,7 +1313,7 @@
description="Use KWallet if KWallet & SecretService are both available."/>
-
-
+
@@ -1381,7 +1382,7 @@
key="actions.on.save.page.title"
nonDefaultProject="false"/>
-
+
@@ -1491,7 +1492,7 @@
implementation="com.intellij.openapi.editor.EditorMouseHoverPopupManager$MyEditorMouseMotionEventListener"/>
@@ -1548,13 +1549,13 @@
-
-
-
@@ -1565,7 +1566,7 @@
-
+
@@ -1769,7 +1770,7 @@
-
@@ -1791,10 +1792,10 @@
-
-
@@ -2010,7 +2011,7 @@
-
-
+
@@ -2037,7 +2039,7 @@
description="Disables Low Memory notifications during indexing for the sake of less false-positive detection for users" />
-
diff --git a/platform/platform-resources/src/META-INF/PlatformLangComponents.xml b/platform/platform-resources/src/META-INF/PlatformLangComponents.xml
index 2a07af7081f9..c468befd5cf8 100644
--- a/platform/platform-resources/src/META-INF/PlatformLangComponents.xml
+++ b/platform/platform-resources/src/META-INF/PlatformLangComponents.xml
@@ -11,7 +11,7 @@
-
-
-
+
-
-
-
-
-
@@ -99,10 +99,10 @@
-
-
@@ -127,10 +127,10 @@
defaultValue="false"
/>
-
-
@@ -139,12 +139,12 @@
serviceImplementation="com.intellij.openapi.project.configuration.EmptyLoggingService"
headlessImplementation="com.intellij.openapi.project.configuration.HeadlessLoggingServiceImpl"/>
-
-
-
@@ -170,7 +170,7 @@
serviceImplementation="com.intellij.formatting.visualLayer.VisualFormattingLayerServiceImpl" />
@@ -178,15 +178,16 @@
-
+
-
+
-
-
-
+
@@ -68,13 +68,13 @@
-
-
-
-
+
+
+
-
-
+
@@ -93,7 +93,7 @@
-
diff --git a/platform/platform-resources/src/META-INF/ProjectModelLangExtensions.xml b/platform/platform-resources/src/META-INF/ProjectModelLangExtensions.xml
index e64d08404b5c..197cda4f2dbe 100644
--- a/platform/platform-resources/src/META-INF/ProjectModelLangExtensions.xml
+++ b/platform/platform-resources/src/META-INF/ProjectModelLangExtensions.xml
@@ -22,12 +22,12 @@
serviceImplementation="com.intellij.workspaceModel.ide.impl.legacyBridge.project.ProjectRootManagerBridge"/>
-
+
-
@@ -76,11 +76,11 @@
-
+ serviceImplementation="com.intellij.openapi.roots.ui.configuration.actions.ModuleDeleteProvider" open="true"/>
@@ -106,7 +106,7 @@
-
-
diff --git a/platform/projectModel-api/resources/META-INF/ProjectModel.xml b/platform/projectModel-api/resources/META-INF/ProjectModel.xml
index 56804efbc204..f9dfb18dddd0 100644
--- a/platform/projectModel-api/resources/META-INF/ProjectModel.xml
+++ b/platform/projectModel-api/resources/META-INF/ProjectModel.xml
@@ -12,8 +12,8 @@
-
-
+
diff --git a/platform/projectModel-impl/resources/META-INF/ProjectModelImpl.xml b/platform/projectModel-impl/resources/META-INF/ProjectModelImpl.xml
index 45119a152581..369eadd0d96f 100644
--- a/platform/projectModel-impl/resources/META-INF/ProjectModelImpl.xml
+++ b/platform/projectModel-impl/resources/META-INF/ProjectModelImpl.xml
@@ -16,7 +16,7 @@
dynamic="true"/>
-
@@ -32,14 +32,15 @@
serviceImplementation="com.intellij.workspaceModel.ide.impl.legacyBridge.module.roots.TestModulePropertiesBridgeProvider"/>
+ serviceImplementation="com.intellij.workspaceModel.ide.impl.jps.serialization.JpsGlobalModelSynchronizerImpl"
+ open="true"/>
-
-
@@ -49,7 +50,7 @@
-
@@ -60,11 +61,12 @@
-
+ serviceImplementation="com.intellij.openapi.roots.impl.ModuleFileIndexImpl"
+ open="true"/>
diff --git a/platform/projectModel-impl/resources/META-INF/WorkspaceModelImpl.xml b/platform/projectModel-impl/resources/META-INF/WorkspaceModelImpl.xml
index 4fbba21f56e0..b629504434d3 100644
--- a/platform/projectModel-impl/resources/META-INF/WorkspaceModelImpl.xml
+++ b/platform/projectModel-impl/resources/META-INF/WorkspaceModelImpl.xml
@@ -7,7 +7,7 @@
-
diff --git a/platform/searchEverywhere/frontend/resources/intellij.platform.searchEverywhere.frontend.xml b/platform/searchEverywhere/frontend/resources/intellij.platform.searchEverywhere.frontend.xml
index 3a086d401f29..cbd449b163e3 100644
--- a/platform/searchEverywhere/frontend/resources/intellij.platform.searchEverywhere.frontend.xml
+++ b/platform/searchEverywhere/frontend/resources/intellij.platform.searchEverywhere.frontend.xml
@@ -27,6 +27,7 @@
"
+ serviceImplementation="com.intellij.platform.searchEverywhere.frontend.SeDefaultTabsCustomizer"
+ open="true"/>"
\ No newline at end of file
diff --git a/platform/structuralsearch/resources/intellij.platform.structuralSearch.xml b/platform/structuralsearch/resources/intellij.platform.structuralSearch.xml
index daac30b824f4..2f46d4929dfe 100644
--- a/platform/structuralsearch/resources/intellij.platform.structuralSearch.xml
+++ b/platform/structuralsearch/resources/intellij.platform.structuralSearch.xml
@@ -20,7 +20,7 @@
implementationClass="com.intellij.structuralsearch.inspection.SSBasedInspection"/>
-
+
diff --git a/platform/todo/resources/intellij.platform.todo.xml b/platform/todo/resources/intellij.platform.todo.xml
index f38913b4d0b9..fbddac3b42c8 100644
--- a/platform/todo/resources/intellij.platform.todo.xml
+++ b/platform/todo/resources/intellij.platform.todo.xml
@@ -17,15 +17,15 @@
bundle="messages.IdeBundle"/>
-
-
+
+
-
-
+
diff --git a/platform/vcs-api/vcs-api-core/resources/intellij.platform.vcs.core.xml b/platform/vcs-api/vcs-api-core/resources/intellij.platform.vcs.core.xml
index b982012ca548..a8eac784b3a6 100644
--- a/platform/vcs-api/vcs-api-core/resources/intellij.platform.vcs.core.xml
+++ b/platform/vcs-api/vcs-api-core/resources/intellij.platform.vcs.core.xml
@@ -1,6 +1,6 @@
-
\ No newline at end of file
diff --git a/platform/vcs-impl/resources/META-INF/VcsExtensions.xml b/platform/vcs-impl/resources/META-INF/VcsExtensions.xml
index eefe3c075f04..8c5c1c079a3f 100644
--- a/platform/vcs-impl/resources/META-INF/VcsExtensions.xml
+++ b/platform/vcs-impl/resources/META-INF/VcsExtensions.xml
@@ -271,7 +271,7 @@
-
@@ -311,7 +311,7 @@
-
diff --git a/platform/whatsNew/resources/intellij.platform.whatsNew.xml b/platform/whatsNew/resources/intellij.platform.whatsNew.xml
index 78233243e0e6..71cc01dcf42c 100644
--- a/platform/whatsNew/resources/intellij.platform.whatsNew.xml
+++ b/platform/whatsNew/resources/intellij.platform.whatsNew.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/platform/xdebugger-impl/resources/intellij.platform.debugger.impl.content.xml b/platform/xdebugger-impl/resources/intellij.platform.debugger.impl.content.xml
index 803a7df3dd7c..6581622eb0f2 100644
--- a/platform/xdebugger-impl/resources/intellij.platform.debugger.impl.content.xml
+++ b/platform/xdebugger-impl/resources/intellij.platform.debugger.impl.content.xml
@@ -40,7 +40,7 @@
serviceImplementation="com.intellij.xdebugger.impl.settings.XDebuggerSettingManagerImpl"/>
-
@@ -109,7 +109,7 @@
-
+
@@ -125,14 +125,14 @@
-
-
diff --git a/plugins/git4idea/resources/intellij.vcs.git.xml b/plugins/git4idea/resources/intellij.vcs.git.xml
index d5833da1ce57..0a6b3843f15d 100644
--- a/plugins/git4idea/resources/intellij.vcs.git.xml
+++ b/plugins/git4idea/resources/intellij.vcs.git.xml
@@ -751,7 +751,7 @@
serviceImplementation="git4idea.branch.GitBranchesUIHandlerImpl"/>
-
@@ -761,7 +761,7 @@
-
+
@@ -900,7 +900,7 @@
-
diff --git a/plugins/gradle/plugin-resources/META-INF/plugin.xml b/plugins/gradle/plugin-resources/META-INF/plugin.xml
index 0abd577d4bb3..607044ccabc1 100644
--- a/plugins/gradle/plugin-resources/META-INF/plugin.xml
+++ b/plugins/gradle/plugin-resources/META-INF/plugin.xml
@@ -157,17 +157,17 @@
-
+
-
-
+
+
-
+
diff --git a/plugins/ide-startup/importSettings/resources/intellij.ide.startup.importSettings.xml b/plugins/ide-startup/importSettings/resources/intellij.ide.startup.importSettings.xml
index 22592bd0b811..d7ee92d63781 100644
--- a/plugins/ide-startup/importSettings/resources/intellij.ide.startup.importSettings.xml
+++ b/plugins/ide-startup/importSettings/resources/intellij.ide.startup.importSettings.xml
@@ -28,7 +28,7 @@
-
+ serviceImplementation="org.jetbrains.kotlin.idea.kdoc.IdeKDocLinkResolutionService"
+ open="true"/>
diff --git a/plugins/maven/src/main/resources/META-INF/plugin.xml b/plugins/maven/src/main/resources/META-INF/plugin.xml
index c5fd77773031..6d01f096e9b6 100644
--- a/plugins/maven/src/main/resources/META-INF/plugin.xml
+++ b/plugins/maven/src/main/resources/META-INF/plugin.xml
@@ -121,7 +121,7 @@
-
diff --git a/plugins/properties/properties-common/resources/intellij.properties.xml b/plugins/properties/properties-common/resources/intellij.properties.xml
index 2e367067c4fa..931ef085278c 100644
--- a/plugins/properties/properties-common/resources/intellij.properties.xml
+++ b/plugins/properties/properties-common/resources/intellij.properties.xml
@@ -15,7 +15,7 @@
-
diff --git a/plugins/sh/terminal/resources/intellij.sh.terminal.xml b/plugins/sh/terminal/resources/intellij.sh.terminal.xml
index ce6786f115e6..f5c60c1e390d 100644
--- a/plugins/sh/terminal/resources/intellij.sh.terminal.xml
+++ b/plugins/sh/terminal/resources/intellij.sh.terminal.xml
@@ -5,7 +5,8 @@
-
+
diff --git a/plugins/terminal/backend/resources/intellij.terminal.backend.xml b/plugins/terminal/backend/resources/intellij.terminal.backend.xml
index 19fa45597f78..b4e39a963a6e 100644
--- a/plugins/terminal/backend/resources/intellij.terminal.backend.xml
+++ b/plugins/terminal/backend/resources/intellij.terminal.backend.xml
@@ -7,13 +7,13 @@
-
-
\ No newline at end of file
diff --git a/plugins/terminal/resources/META-INF/terminal.xml b/plugins/terminal/resources/META-INF/terminal.xml
index a47a46cfbc2c..f8c408dd7830 100644
--- a/plugins/terminal/resources/META-INF/terminal.xml
+++ b/plugins/terminal/resources/META-INF/terminal.xml
@@ -4,7 +4,7 @@
factoryClass="org.jetbrains.plugins.terminal.TerminalToolWindowFactory"
secondary="false"
canCloseContents="true"/>
-
+
-
diff --git a/python/pluginResources/intellij.python.community.impl.xml b/python/pluginResources/intellij.python.community.impl.xml
index 0b6e2441f064..08b7447d1650 100644
--- a/python/pluginResources/intellij.python.community.impl.xml
+++ b/python/pluginResources/intellij.python.community.impl.xml
@@ -161,7 +161,7 @@
-
@@ -564,7 +564,7 @@
-
diff --git a/python/python-psi-impl/resources/intellij.python.psi.impl.xml b/python/python-psi-impl/resources/intellij.python.psi.impl.xml
index bb5852941deb..f3a5392c542a 100644
--- a/python/python-psi-impl/resources/intellij.python.psi.impl.xml
+++ b/python/python-psi-impl/resources/intellij.python.psi.impl.xml
@@ -104,7 +104,8 @@
+ serviceImplementation="com.jetbrains.python.codeInsight.imports.PyImportLocationHelper"
+ open="true"/>
+ serviceImplementation="com.jetbrains.python.PythonCodeStyleServiceImpl"
+ open="true"/>
diff --git a/xml/dom-impl/resources/intellij.xml.dom.impl.xml b/xml/dom-impl/resources/intellij.xml.dom.impl.xml
index 9a3d140bc044..5876e6a17dec 100644
--- a/xml/dom-impl/resources/intellij.xml.dom.impl.xml
+++ b/xml/dom-impl/resources/intellij.xml.dom.impl.xml
@@ -54,7 +54,7 @@
-