BUG-4688: Disconnect Module and ModuleIdentifier