diff --git a/.idea/modules.xml b/.idea/modules.xml
index 02df92db48dd..e64236411c7f 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1,3 +1,7 @@
+<!--
+     Modified by Dmitrij Pochepko at 2025 as part of the OpenIDE project (https://openide.ru).
+     Any modifications are available on the same license terms as the original source code.
+-->
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ProjectModuleManager">
@@ -939,8 +943,6 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/search-everywhere-ml/typos/intellij.searchEverywhereMl.typos.iml" filepath="$PROJECT_DIR$/plugins/search-everywhere-ml/typos/intellij.searchEverywhereMl.typos.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/settings-repository/intellij.settingsRepository.iml" filepath="$PROJECT_DIR$/plugins/settings-repository/intellij.settingsRepository.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/settings-repository/intellij.settingsRepository.tests.iml" filepath="$PROJECT_DIR$/plugins/settings-repository/intellij.settingsRepository.tests.iml" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/settings-sync/jba/intellij.settingsSync.iml" filepath="$PROJECT_DIR$/plugins/settings-sync/jba/intellij.settingsSync.iml" />
-      <module fileurl="file://$PROJECT_DIR$/platform/settings-sync-core/intellij.settingsSync.core.iml" filepath="$PROJECT_DIR$/platform/settings-sync-core/intellij.settingsSync.core.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/sh/intellij.sh.iml" filepath="$PROJECT_DIR$/plugins/sh/intellij.sh.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/sh/copyright/intellij.sh.copyright.iml" filepath="$PROJECT_DIR$/plugins/sh/copyright/intellij.sh.copyright.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/sh/copyright/tests/intellij.sh.copyright.tests.iml" filepath="$PROJECT_DIR$/plugins/sh/copyright/tests/intellij.sh.copyright.tests.iml" />
diff --git a/community-resources/resources/META-INF/IdeaPlugin.xml b/community-resources/resources/META-INF/IdeaPlugin.xml
index fe9eb7a5248f..e6ed3d7cca8b 100644
--- a/community-resources/resources/META-INF/IdeaPlugin.xml
+++ b/community-resources/resources/META-INF/IdeaPlugin.xml
@@ -1,3 +1,7 @@
+<!--
+     Modified by Dmitrij Pochepko at 2025 as part of the OpenIDE project (https://openide.ru).
+     Any modifications are available on the same license terms as the original source code.
+-->
 <idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <xi:include href="/META-INF/JavaIdePlugin.xml"/>
   <xi:include href="/ideTipsAndTricks.xml"/>
@@ -14,7 +18,6 @@
     <module name="intellij.platform.ide.newUiOnboarding"/>
     <module name="intellij.platform.ide.newUsersOnboarding"/>
     <module name="intellij.ide.startup.importSettings"/>
-    <module name="intellij.settingsSync.core"/>
     <module name="intellij.kotlin.onboarding-promoter"/>
     <module name="intellij.idea.customization.base"/>
     <module name="intellij.platform.tips"/>
diff --git a/intellij.idea.community.main.iml b/intellij.idea.community.main.iml
index 2ac02e205b62..6ad4c78558fd 100644
--- a/intellij.idea.community.main.iml
+++ b/intellij.idea.community.main.iml
@@ -1,3 +1,7 @@
+<!--
+     Modified by Dmitrij Pochepko at 2025 as part of the OpenIDE project (https://openide.ru).
+     Any modifications are available on the same license terms as the original source code.
+-->
 <?xml version="1.0" encoding="UTF-8"?>
 <module relativePaths="true" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
@@ -147,7 +151,6 @@
     <orderEntry type="module" module-name="intellij.space.java.jps" scope="TEST" />
     <orderEntry type="module" module-name="intellij.emojipicker" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.gradle.dependencyUpdater" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.settingsSync.core" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.java.featuresTrainer" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.idea.community.build.tasks" scope="TEST" />
     <orderEntry type="module" module-name="intellij.junit.v5.rt.tests" scope="TEST" />
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt
index eac63289a041..45fdf33bfe55 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt
@@ -1,4 +1,6 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Modified by Dmitrij Pochepko at 2025 as part of the OpenIDE project (https://openide.ru).
+// Any modifications are available on the same license terms as the original source code.
 @file:Suppress("ReplaceJavaStaticMethodWithKotlinAnalog")
 
 package org.jetbrains.intellij.build
@@ -45,7 +47,6 @@ val IDEA_BUNDLED_PLUGINS: PersistentList<String> = DEFAULT_BUNDLED_PLUGINS + seq
   "intellij.emojipicker",
   "intellij.textmate",
   "intellij.editorconfig",
-  "intellij.settingsSync",
   "intellij.configurationScript",
   "intellij.json",
   "intellij.yaml",
diff --git a/platform/platform-impl/bootstrap/src/com/intellij/platform/ide/bootstrap/ApplicationLoader.kt b/platform/platform-impl/bootstrap/src/com/intellij/platform/ide/bootstrap/ApplicationLoader.kt
index 677e0e31d4c5..01fb0d7cabd2 100644
--- a/platform/platform-impl/bootstrap/src/com/intellij/platform/ide/bootstrap/ApplicationLoader.kt
+++ b/platform/platform-impl/bootstrap/src/com/intellij/platform/ide/bootstrap/ApplicationLoader.kt
@@ -1,4 +1,6 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Modified by Dmitrij Pochepko at 2025 as part of the OpenIDE project (https://openide.ru).
+// Any modifications are available on the same license terms as the original source code.
 @file:JvmName("ApplicationLoader")
 @file:Internal
 @file:Suppress("RAW_RUN_BLOCKING", "ReplaceJavaStaticMethodWithKotlinAnalog")
@@ -260,7 +262,6 @@ internal suspend fun loadApp(
 
 private val asyncAppListenerAllowListForNonCorePlugin = java.util.Set.of(
   "com.jetbrains.rdserver.unattendedHost.logs.BackendMessagePoolExporter\$MyAppListener",
-  "com.intellij.settingsSync.SettingsSynchronizerApplicationInitializedListener",
   "com.intellij.pycharm.ds.jupyter.JupyterDSProjectLifecycleListener",
   "com.jetbrains.gateway.GatewayBuildDateExpirationListener",
   "com.intellij.ide.misc.PluginAgreementUpdateScheduler",
diff --git a/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsProviderTest.kt b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsProviderTest.kt
index 4416460cad25..107904fa1ad5 100644
--- a/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsProviderTest.kt
+++ b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsProviderTest.kt
@@ -1,3 +1,5 @@
+// Modified by Dmitrij Pochepko at 2025 as part of the OpenIDE project (https://openide.ru).
+// Any modifications are available on the same license terms as the original source code.
 package com.intellij.settingsSync.core
 
 import com.intellij.ide.GeneralSettings
@@ -23,7 +25,7 @@ internal class SettingsProviderTest : SettingsSyncRealIdeTestBase() {
     application.registerExtension(SettingsProvider.SETTINGS_PROVIDER_EP, settingsProvider, disposable)
   }
 
-  @Test
+//  @Test
   fun `settings from provider should be collected`() = timeoutRunBlockingAndStopBridge {
     val ideState = TestState("IDE value")
     settingsProvider.settings = ideState
@@ -48,7 +50,7 @@ internal class SettingsProviderTest : SettingsSyncRealIdeTestBase() {
     }
   }
 
-  @Test
+//  @Test
   fun `settings from provider changed on another client should be applied`() = timeoutRunBlockingAndStopBridge {
     val state = TestState("Server value")
     remoteCommunicator.prepareFileOnServer(settingsSnapshot {
@@ -64,7 +66,7 @@ internal class SettingsProviderTest : SettingsSyncRealIdeTestBase() {
     assertEquals("Server value", settingsProvider.settings!!.property, "Settings from server were not applied")
   }
 
-  @Test
+//  @Test
   fun `test merge settings provider settings`() = timeoutRunBlockingAndStopBridge {
     val serverState = TestState(property = "Server value")
     remoteCommunicator.prepareFileOnServer(settingsSnapshot {
diff --git a/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncRealIdeTest.kt b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncRealIdeTest.kt
index 8207b9020a08..e46f6ed23863 100644
--- a/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncRealIdeTest.kt
+++ b/platform/settings-sync-core/tests/com/intellij/settingsSync/core/SettingsSyncRealIdeTest.kt
@@ -1,3 +1,5 @@
+// Modified by Dmitrij Pochepko at 2025 as part of the OpenIDE project (https://openide.ru).
+// Any modifications are available on the same license terms as the original source code.
 package com.intellij.settingsSync.core
 
 import com.intellij.configurationStore.getPerOsSettingsStorageFolderName
@@ -24,7 +26,7 @@ import kotlin.time.Duration.Companion.seconds
 
 internal class SettingsSyncRealIdeTest : SettingsSyncRealIdeTestBase() {
 
-  @Test
+//  @Test
   fun `settings are pushed`() = timeoutRunBlockingAndStopBridge {
     SettingsSyncSettings.getInstance().init()
     SettingsSyncSettings.getInstance().migrationFromOldStorageChecked = true
@@ -47,7 +49,7 @@ internal class SettingsSyncRealIdeTest : SettingsSyncRealIdeTestBase() {
     }
   }
 
-  @Test
+//  @Test
   fun `scheme changes are logged`() = timeoutRunBlockingAndStopBridge {
     initSettingsSync(SettingsSyncBridge.InitMode.JustInit)
 
@@ -76,7 +78,7 @@ internal class SettingsSyncRealIdeTest : SettingsSyncRealIdeTestBase() {
     runBlocking { componentStore.save() }
   }
 
-  @Test
+//  @Test
   fun `quickly modified settings are pushed together`() = timeoutRunBlockingAndStopBridge {
     initSettingsSync(SettingsSyncBridge.InitMode.JustInit)
 
@@ -103,7 +105,7 @@ internal class SettingsSyncRealIdeTest : SettingsSyncRealIdeTestBase() {
     }
   }
 
-  @Test
+//  @Test
   fun `existing settings are copied on initialization`() = timeoutRunBlockingAndStopBridge {
     GeneralSettings.getInstance().initModifyAndSave {
       autoSaveFiles = false
@@ -131,7 +133,7 @@ internal class SettingsSyncRealIdeTest : SettingsSyncRealIdeTestBase() {
     }
   }
 
-  @Test
+//  @Test
   fun `disabled categories should be ignored when copying settings on initialization`() = timeoutRunBlockingAndStopBridge {
     GeneralSettings.getInstance().initModifyAndSave {
       autoSaveFiles = false
@@ -166,7 +168,7 @@ internal class SettingsSyncRealIdeTest : SettingsSyncRealIdeTestBase() {
     }
   }
 
-  @Test
+//  @Test
   fun `settings from server are applied`() = timeoutRunBlockingAndStopBridge(5.seconds) {
     val generalSettings = GeneralSettings.getInstance().init()
     initSettingsSync(SettingsSyncBridge.InitMode.JustInit)
@@ -184,7 +186,7 @@ internal class SettingsSyncRealIdeTest : SettingsSyncRealIdeTestBase() {
     bridge.waitForAllExecuted()
   }
 
-  @Test
+//  @Test
   fun `enabling category should copy existing settings from that category`() = timeoutRunBlockingAndStopBridge {
     SettingsSyncSettings.getInstance().setCategoryEnabled(SettingsCategory.CODE, isEnabled = false)
     GeneralSettings.getInstance().initModifyAndSave {
@@ -224,7 +226,7 @@ internal class SettingsSyncRealIdeTest : SettingsSyncRealIdeTestBase() {
     }
   }
 
-  @Test
+//  @Test
   fun `not enabling cross IDE sync initially works as expected`() = timeoutRunBlockingAndStopBridge {
     SettingsSyncSettings.getInstance().init()
     GeneralSettings.getInstance().initModifyAndSave { autoSaveFiles = false }
@@ -245,7 +247,7 @@ internal class SettingsSyncRealIdeTest : SettingsSyncRealIdeTestBase() {
     }
   }
 
-  @Test
+//  @Test
   fun `enabling cross IDE sync initially works as expected`() = timeoutRunBlockingAndStopBridge {
     SettingsSyncSettings.getInstance().init()
     GeneralSettings.getInstance().initModifyAndSave { autoSaveFiles = false }
@@ -266,7 +268,7 @@ internal class SettingsSyncRealIdeTest : SettingsSyncRealIdeTestBase() {
     }
   }
 
-  @Test
+//  @Test
   fun `sync settings are always uploaded even if system settings are disabled`() = timeoutRunBlockingAndStopBridge {
     SettingsSyncSettings.getInstance().init()
     GeneralSettings.getInstance().initModifyAndSave { autoSaveFiles = false }
@@ -283,19 +285,19 @@ internal class SettingsSyncRealIdeTest : SettingsSyncRealIdeTestBase() {
     }
   }
 
-  @Test
+//  @Test
   fun `exportable non-roamable settings should not be synced`() = timeoutRunBlockingAndStopBridge {
     testVariousComponentsShouldBeSyncedOrNot(ExportableNonRoamable(), expectedToBeSynced = false)
   }
 
-  @Test
+//  @Test
   fun `roamable settings should be synced`() = timeoutRunBlockingAndStopBridge {
     testVariousComponentsShouldBeSyncedOrNot(Roamable(), expectedToBeSynced = true)
   }
 
 
-  @Test
-  @TestFor(issues = ["IJPL-162877"])
+//  @Test
+//  @TestFor(issues = ["IJPL-162877"])
   fun `don't sync non-roamable files`() = timeoutRunBlockingAndStopBridge {
     val nonRoamable = ExportableNonRoamable()
 
@@ -356,7 +358,7 @@ internal class SettingsSyncRealIdeTest : SettingsSyncRealIdeTestBase() {
     }
   }
 
-  @Test
+//  @Test
   fun `local and remote changes in different files are both applied`() = timeoutRunBlockingAndStopBridge {
     val generalSettings = GeneralSettings.getInstance().init()
     initSettingsSync(SettingsSyncBridge.InitMode.JustInit)
diff --git a/python/build/plugin-list.txt b/python/build/plugin-list.txt
index 047495f7ac21..9ff1c8e9b7d9 100644
--- a/python/build/plugin-list.txt
+++ b/python/build/plugin-list.txt
@@ -16,7 +16,6 @@ intellij.properties
 intellij.restructuredtext
 intellij.searchEverywhereMl
 intellij.marketplaceMl
-intellij.settingsSync
 intellij.sh
 intellij.statsCollector
 intellij.tasks.core
diff --git a/python/ide-common/resources/META-INF/PyCharmCorePlugin.xml b/python/ide-common/resources/META-INF/PyCharmCorePlugin.xml
index a6b97940e818..5d59c8e75017 100644
--- a/python/ide-common/resources/META-INF/PyCharmCorePlugin.xml
+++ b/python/ide-common/resources/META-INF/PyCharmCorePlugin.xml
@@ -1,4 +1,7 @@
-<!-- Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -->
+<!-- Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+     Modified by Dmitrij Pochepko at 2025 as part of the OpenIDE project (https://openide.ru).
+     Any modifications are available on the same license terms as the original source code.
+-->
 <idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <module value="com.intellij.modules.pycharm.community"/>
   <module value="com.intellij.modules.python-core-capable"/>
@@ -6,7 +9,6 @@
   <content>
     <module name="intellij.platform.ide.newUiOnboarding"/>
     <module name="intellij.ide.startup.importSettings"/>
-    <module name="intellij.settingsSync.core"/>
     <module name="intellij.platform.tips"/>
   </content>