diff --git a/platform/external-system-api/api-dump.txt b/platform/external-system-api/api-dump.txt
index ead99b34f304..f00494d359b6 100644
--- a/platform/external-system-api/api-dump.txt
+++ b/platform/external-system-api/api-dump.txt
@@ -30,6 +30,7 @@ a:com.intellij.openapi.externalSystem.ExternalSystemModulePropertyManager
 - a:setExternalId(com.intellij.openapi.externalSystem.model.ProjectSystemId):V
 - a:setExternalModuleType(java.lang.String):V
 - a:setExternalOptions(com.intellij.openapi.externalSystem.model.ProjectSystemId,com.intellij.openapi.externalSystem.model.project.ModuleData,com.intellij.openapi.externalSystem.model.project.ProjectData):V
+- a:setLinkedProjectId(java.lang.String):V
 - a:setLinkedProjectPath(java.lang.String):V
 - a:setMavenized(Z):V
 - a:setRootProjectPath(java.lang.String):V
diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/ExternalSystemModulePropertyManager.kt b/platform/external-system-api/src/com/intellij/openapi/externalSystem/ExternalSystemModulePropertyManager.kt
index aa37e474adea..f888c2fd7eb2 100644
--- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/ExternalSystemModulePropertyManager.kt
+++ b/platform/external-system-api/src/com/intellij/openapi/externalSystem/ExternalSystemModulePropertyManager.kt
@@ -26,6 +26,7 @@ abstract class ExternalSystemModulePropertyManager {
   abstract fun unlinkExternalOptions()
   abstract fun setExternalOptions(id: ProjectSystemId, moduleData: ModuleData, projectData: ProjectData?)
   abstract fun setExternalId(id: ProjectSystemId)
+  abstract fun setLinkedProjectId(id: String?)
   abstract fun setLinkedProjectPath(path: String?)
   abstract fun setRootProjectPath(path: String?)
   abstract fun setExternalModuleType(type: String?)
diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/ExternalSystemModulePropertyManagerBridge.kt b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/ExternalSystemModulePropertyManagerBridge.kt
index d092642e469a..badc197cc96b 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/ExternalSystemModulePropertyManagerBridge.kt
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/ExternalSystemModulePropertyManagerBridge.kt
@@ -165,6 +165,12 @@ class ExternalSystemModulePropertyManagerBridge(private val module: Module) : Ex
     updateSource()
   }
 
+  override fun setLinkedProjectId(id: String?) {
+    editEntity {
+      linkedProjectId = id
+    }
+  }
+
   override fun setLinkedProjectPath(path: String?) {
     editEntity {
       linkedProjectPath = path
@@ -188,6 +194,6 @@ class ExternalSystemModulePropertyManagerBridge(private val module: Module) : Ex
 
   private fun getModuleDiff(): MutableEntityStorage? {
     val modelsProvider = module.getUserData(IdeModifiableModelsProviderImpl.MODIFIABLE_MODELS_PROVIDER_KEY)
-    return if (modelsProvider != null) modelsProvider.actualStorageBuilder else (module as ModuleBridge).diff as? MutableEntityStorage
+    return modelsProvider?.actualStorageBuilder ?: (module as ModuleBridge).diff
   }
 }
\ No newline at end of file