diff --git a/.github/stale.yml b/.github/stale.yml
new file mode 100644
index 00000000000..6ad93d1570f
--- /dev/null
+++ b/.github/stale.yml
@@ -0,0 +1,20 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+    - Hacktoberfest
+    - bug
+    - enhancement
+    - RFC
+    - ⭐ EU-FOSSA Hackathon
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+    This issue has been automatically marked as stale because it has not had
+    recent activity. It will be closed if no further activity occurs. Thank you
+    for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false
diff --git a/composer.json b/composer.json
index 1dcab68224f..ad9b3eae946 100644
--- a/composer.json
+++ b/composer.json
@@ -143,7 +143,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "3.0.x-dev"
+            "dev-main": "3.1.x-dev"
         },
         "symfony": {
             "require": "^6.1"
diff --git a/src/Doctrine/Common/State/LinksHandlerTrait.php b/src/Doctrine/Common/State/LinksHandlerTrait.php
index badd9d3df50..65aaf3ab447 100644
--- a/src/Doctrine/Common/State/LinksHandlerTrait.php
+++ b/src/Doctrine/Common/State/LinksHandlerTrait.php
@@ -34,11 +34,13 @@ private function getLinks(string $resourceClass, Operation $operation, array $co
             return $links;
         }
 
-        $newLinks = [];
+        $newLink = null;
+        $linkProperty = $context['linkProperty'];
 
         foreach ($links as $link) {
-            if ($linkClass === $link->getFromClass()) {
-                $newLinks[] = $link;
+            if (($linkClass === $link->getFromClass()) && ($linkProperty === $link->getFromProperty())) {
+                $newLink = $link;
+                break;
             }
         }
 
@@ -62,16 +64,17 @@ private function getLinks(string $resourceClass, Operation $operation, array $co
         }
 
         foreach ($this->getOperationLinks($linkedOperation ?? null) as $link) {
-            if ($resourceClass === $link->getToClass()) {
-                $newLinks[] = $link;
+            if (($resourceClass === $link->getToClass()) && ($linkProperty === $link->getFromProperty())) {
+                $newLink = $link;
+                break;
             }
         }
 
-        if (!$newLinks) {
+        if (null === $newLink) {
             throw new RuntimeException(sprintf('The class "%s" cannot be retrieved from "%s".', $resourceClass, $linkClass));
         }
 
-        return $newLinks;
+        return [$newLink];
     }
 
     private function getIdentifierValue(array &$identifiers, string $name = null): mixed
diff --git a/src/GraphQl/Resolver/Stage/ReadStage.php b/src/GraphQl/Resolver/Stage/ReadStage.php
index b5c7d119030..527b7aea493 100644
--- a/src/GraphQl/Resolver/Stage/ReadStage.php
+++ b/src/GraphQl/Resolver/Stage/ReadStage.php
@@ -83,6 +83,7 @@ public function __invoke(?string $resourceClass, ?string $rootClass, Operation $
         if (isset($source[$info->fieldName], $source[ItemNormalizer::ITEM_IDENTIFIERS_KEY], $source[ItemNormalizer::ITEM_RESOURCE_CLASS_KEY])) {
             $uriVariables = $source[ItemNormalizer::ITEM_IDENTIFIERS_KEY];
             $normalizationContext['linkClass'] = $source[ItemNormalizer::ITEM_RESOURCE_CLASS_KEY];
+            $normalizationContext['linkProperty'] = $info->fieldName;
         }
 
         return $this->provider->provide($operation, $uriVariables, $normalizationContext);
diff --git a/src/Metadata/Resource/Factory/LinkResourceMetadataCollectionFactory.php b/src/Metadata/Resource/Factory/LinkResourceMetadataCollectionFactory.php
index e8e7b9990f0..1c4e5829620 100644
--- a/src/Metadata/Resource/Factory/LinkResourceMetadataCollectionFactory.php
+++ b/src/Metadata/Resource/Factory/LinkResourceMetadataCollectionFactory.php
@@ -68,18 +68,22 @@ private function mergeLinks(array $links, array $toMergeLinks): array
     {
         $classLinks = [];
         foreach ($links as $link) {
-            $classLinks[$link->getToClass()] = $link;
+            $classLinks[$link->getToClass()][$link->getFromProperty()] = $link;
         }
 
         foreach ($toMergeLinks as $link) {
-            if (isset($classLinks[$link->getToClass()])) {
-                $classLinks[$link->getToClass()] = $classLinks[$link->getToClass()]->withLink($link);
+            if (null !== $prevLink = $classLinks[$link->getToClass()][$link->getFromProperty()] ?? null) {
+                $classLinks[$link->getToClass()][$link->getFromProperty()] = $prevLink->withLink($link);
 
                 continue;
             }
-            $classLinks[$link->getToClass()] = $link;
+            $classLinks[$link->getToClass()][$link->getFromProperty()] = $link;
         }
 
-        return array_values($classLinks);
+        // return array_values(array_merge(...array_values($classLinks)));   (branch 3.0)
+
+        return array_reduce($classLinks, static function (array $carry, array $item) {
+            return array_merge($carry, array_values($item));
+        }, []);
     }
 }
diff --git a/tests/GraphQl/Resolver/Stage/ReadStageTest.php b/tests/GraphQl/Resolver/Stage/ReadStageTest.php
index 95c53841691..40d81388f37 100644
--- a/tests/GraphQl/Resolver/Stage/ReadStageTest.php
+++ b/tests/GraphQl/Resolver/Stage/ReadStageTest.php
@@ -199,7 +199,8 @@ public function testApplyCollection(array $args, ?string $rootClass, ?array $sou
         $this->serializerContextBuilderProphecy->create($resourceClass, $operation, $context, true)->shouldBeCalled()->willReturn($normalizationContext);
 
         $this->providerProphecy->provide($operation, [], $normalizationContext + ['filters' => $expectedFilters])->willReturn([]);
-        $this->providerProphecy->provide($operation, ['id' => 3], $normalizationContext + ['filters' => $expectedFilters, 'linkClass' => 'myResource'])->willReturn(['resource']);
+        // $this->providerProphecy->provide($operation, ['id' => 3], $normalizationContext + ['filters' => $expectedFilters, 'linkClass' => 'myResource'])->willReturn(['resource']);
+        $this->providerProphecy->provide($operation, ['id' => 3], $normalizationContext + ['filters' => $expectedFilters, 'linkClass' => 'myResource', 'linkProperty' => 'subresource'])->willReturn(['subresource']);
 
         $result = ($this->readStage)($resourceClass, $rootClass, $operation, $context);
 
diff --git a/tests/Metadata/Resource/Factory/LinkResourceMetadataCollectionFactoryTest.php b/tests/Metadata/Resource/Factory/LinkResourceMetadataCollectionFactoryTest.php
index 174dcb1442b..790bc52fe4d 100644
--- a/tests/Metadata/Resource/Factory/LinkResourceMetadataCollectionFactoryTest.php
+++ b/tests/Metadata/Resource/Factory/LinkResourceMetadataCollectionFactoryTest.php
@@ -84,6 +84,7 @@ class: AttributeResource::class,
                     class: AttributeResource::class,
                     graphQlOperations: [
                         'item_query' => (new Query(shortName: 'AttributeResource', class: AttributeResource::class))->withLinks([
+                            (new Link())->withFromProperty('foo')->withFromClass(AttributeResource::class)->withToClass(Dummy::class)->withIdentifiers(['id']),
                             (new Link())->withFromProperty('foo2')->withFromClass(AttributeResource::class)->withToClass(Dummy::class)->withIdentifiers(['id']),
                             (new Link())->withFromProperty('bar')->withFromClass(AttributeResource::class)->withToClass(RelatedDummy::class)->withIdentifiers(['id']),
                         ]),