From a89023e360479026b6648843dceaf45fbe3fe37e Mon Sep 17 00:00:00 2001
From: Oliver Hader <oliver@typo3.org>
Date: Tue, 19 Sep 2023 13:05:04 +0200
Subject: [PATCH] [TASK] Ensure package dependencies in functional/acceptance
 tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This change uses the dependency ordering service in the method
`\TYPO3\TestingFramework\Core\Testbase::setUpPackageStates` for
test scenarios in functional and acceptance tests.

Besides that the following changes were applied:
* remove invalid dependency in fixture ext:test_configoverride_second
* add `PackageStatesTest` to keep track of extension dependencies
* add dependency to ext:frontend in ext:form, since it overrides
  TCA for the tables tt_content and sys_template (which would result
  in different ext:impexp results due to table field orderings)
* recreate IRRE related XML fixtures for ext:impexp since fixture
  extensions are now ordered alphabetically (and due to #100734)

Resolves: #101809
Releases: main, 12.4
Change-Id: I1f91a75ac8aec9db0291b0f5c8bcf7162d5b0082
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/81093
Tested-by: core-ci <typo3@b13.com>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: Stefan Bürk <stefan@buerk.tech>
---
 composer.json                                 |   2 +-
 composer.lock                                 |  16 +-
 .../test_configoverride_second/ext_emconf.php |   5 +-
 .../Functional/Package/PackageStatesTest.php  | 154 +++
 typo3/sysext/form/composer.json               |   3 +-
 typo3/sysext/form/ext_emconf.php              |   1 +
 .../Fixtures/XmlExports/irre-records.xml      | 912 ++++++++---------
 .../Fixtures/XmlImports/irre-records.xml      | 938 +++++++++---------
 8 files changed, 1094 insertions(+), 937 deletions(-)
 create mode 100644 typo3/sysext/core/Tests/Functional/Package/PackageStatesTest.php

diff --git a/composer.json b/composer.json
index d80da272a770..64ca7374ea53 100644
--- a/composer.json
+++ b/composer.json
@@ -118,7 +118,7 @@
 		"sokil/php-isocodes-db-i18n": "^4.0.13",
 		"symfony/translation": "^6.2",
 		"typo3/cms-styleguide": "^12.0.2",
-		"typo3/testing-framework": "^8.0.5",
+		"typo3/testing-framework": "^8.0.6",
 		"webmozart/assert": "^1.11.0"
 	},
 	"suggest": {
diff --git a/composer.lock b/composer.lock
index 7be6ea35f3ca..f2f344c054d2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e52fd4005a288e97210463682015f7fd",
+    "content-hash": "11c26e5c4fc58e7cde0befa57fc89d94",
     "packages": [
         {
             "name": "bacon/bacon-qr-code",
@@ -8824,16 +8824,16 @@
         },
         {
             "name": "typo3/testing-framework",
-            "version": "8.0.5",
+            "version": "8.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3/testing-framework.git",
-                "reference": "0810cf3f49ba59c240c75a51fb962c830a909d96"
+                "reference": "70d1174466c339882ab34fad6d5a85763a3a3972"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/0810cf3f49ba59c240c75a51fb962c830a909d96",
-                "reference": "0810cf3f49ba59c240c75a51fb962c830a909d96",
+                "url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/70d1174466c339882ab34fad6d5a85763a3a3972",
+                "reference": "70d1174466c339882ab34fad6d5a85763a3a3972",
                 "shasum": ""
             },
             "require": {
@@ -8892,9 +8892,9 @@
             "support": {
                 "general": "https://typo3.org/support/",
                 "issues": "https://github.com/TYPO3/testing-framework/issues",
-                "source": "https://github.com/TYPO3/testing-framework/tree/8.0.5"
+                "source": "https://github.com/TYPO3/testing-framework/tree/8.0.6"
             },
-            "time": "2023-09-03T11:52:11+00:00"
+            "time": "2023-09-19T17:10:03+00:00"
         }
     ],
     "aliases": [],
@@ -8920,5 +8920,5 @@
     "platform-overrides": {
         "php": "8.1.1"
     },
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.3.0"
 }
diff --git a/typo3/sysext/backend/Tests/Functional/SiteConfiguration/Fixtures/Extensions/test_configoverride_second/ext_emconf.php b/typo3/sysext/backend/Tests/Functional/SiteConfiguration/Fixtures/Extensions/test_configoverride_second/ext_emconf.php
index 799da1e6d841..2bc767538b99 100644
--- a/typo3/sysext/backend/Tests/Functional/SiteConfiguration/Fixtures/Extensions/test_configoverride_second/ext_emconf.php
+++ b/typo3/sysext/backend/Tests/Functional/SiteConfiguration/Fixtures/Extensions/test_configoverride_second/ext_emconf.php
@@ -14,9 +14,10 @@
     'constraints' => [
         'depends' => [
             'typo3' => '12.4.7',
-            'a' => '12.4.7',
         ],
         'conflicts' => [],
-        'suggests' => [],
+        'suggests' => [
+            'test_configoverride_first' => '12.4.7',
+        ],
     ],
 ];
diff --git a/typo3/sysext/core/Tests/Functional/Package/PackageStatesTest.php b/typo3/sysext/core/Tests/Functional/Package/PackageStatesTest.php
new file mode 100644
index 000000000000..69c30120f1df
--- /dev/null
+++ b/typo3/sysext/core/Tests/Functional/Package/PackageStatesTest.php
@@ -0,0 +1,154 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+namespace TYPO3\CMS\Core\Tests\Functional\Package;
+
+use TYPO3\CMS\Core\Cache\Backend\NullBackend;
+use TYPO3\CMS\Core\Package\PackageManager;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
+
+/**
+ * Tests the package states and order of packages in functional tests.
+ * Thus, this is a test case for functional tests.
+ */
+final class PackageStatesTest extends FunctionalTestCase
+{
+    // @todo how to automatically fetch all available TYPO3 system extensions?
+    private const CORE_EXTENSION_TO_LOAD = [
+        'adminpanel',
+        'backend',
+        'belog',
+        'beuser',
+        'dashboard',
+        'extbase',
+        'extensionmanager',
+        'felogin',
+        'filelist',
+        'filemetadata',
+        'fluid',
+        'fluid_styled_content',
+        'form',
+        'frontend',
+        'impexp',
+        'indexed_search',
+        'info',
+        'install',
+        'linkvalidator',
+        'lowlevel',
+        'opendocs',
+        'reactions',
+        'recycler',
+        'redirects',
+        'reports',
+        'rte_ckeditor',
+        'scheduler',
+        'seo',
+        'setup',
+        'sys_note',
+        't3editor',
+        'tstemplate',
+        'viewpage',
+        'webhooks',
+        'workspaces',
+    ];
+
+    protected array $configurationToUseInTestInstance = [
+        'SYS' => [
+            'caching' => [
+                'cacheConfigurations' => [
+                    // disables caching of package states
+                    'core' => [
+                        'backend' => NullBackend::class,
+                    ],
+                ],
+            ],
+        ],
+    ];
+
+    protected function setUp(): void
+    {
+        $this->coreExtensionsToLoad = self::CORE_EXTENSION_TO_LOAD;
+        shuffle($this->coreExtensionsToLoad);
+        parent::setUp();
+    }
+
+    /**
+     * This test cannot test the complete scenario, since the dependency
+     * ordering service can only adjust order base on available information.
+     *
+     * The "sorting constraints" are a combination of static prioritized packages, the
+     * corresponding dependencies from `ext_emconf.php` and finally as a fall-back,
+     * an alphabetic order - which just ensures that the sequence stays the same.
+     *
+     * @test
+     */
+    public function activePackagesAreOrderedByPrioritizedPackageKeysOrPackageDependenciesOrAlphabetically(): void
+    {
+        $packageManager = $this->get(PackageManager::class);
+        $activePackages = $packageManager->getActivePackages();
+        // @todo this list is still incorrect and requires consolidated `ext_emconf.php` constraints
+        $expectedKeys = [
+            'core',
+            'scheduler',
+            'extbase',
+            'fluid',
+            'frontend',
+            'fluid_styled_content',
+            'filelist',
+            'impexp',
+            'form',
+            'install',
+            'info',
+            'linkvalidator',
+            'reports',
+            'redirects',
+            'indexed_search',
+            'recycler',
+            'setup',
+            'rte_ckeditor',
+            'adminpanel',
+            'backend',
+            'belog',
+            'beuser',
+            'dashboard',
+            'extensionmanager',
+            'felogin',
+            'filemetadata',
+            'lowlevel',
+            'opendocs',
+            'reactions',
+            'seo',
+            'sys_note',
+            't3editor',
+            'tstemplate',
+            'viewpage',
+            'webhooks',
+            'workspaces',
+        ];
+
+        self::assertSame(
+            $expectedKeys,
+            // use the order of `$activePackages`, but only pass those values of `$expectedKeys`
+            array_values(
+                array_intersect(
+                    array_keys($activePackages),
+                    $expectedKeys
+                )
+            ),
+        );
+    }
+}
diff --git a/typo3/sysext/form/composer.json b/typo3/sysext/form/composer.json
index bc37776788f3..5faf26e62245 100644
--- a/typo3/sysext/form/composer.json
+++ b/typo3/sysext/form/composer.json
@@ -21,7 +21,8 @@
 	"require": {
 		"psr/http-message": "^1.1 || ^2.0",
 		"symfony/expression-language": "^6.2",
-		"typo3/cms-core": "12.4.*@dev"
+		"typo3/cms-core": "12.4.*@dev",
+		"typo3/cms-frontend": "12.4.*@dev"
 	},
 	"suggest": {
 		"typo3/cms-filelist": "Listing of files in the directory",
diff --git a/typo3/sysext/form/ext_emconf.php b/typo3/sysext/form/ext_emconf.php
index ac1419e10e1d..428021c8fa9f 100644
--- a/typo3/sysext/form/ext_emconf.php
+++ b/typo3/sysext/form/ext_emconf.php
@@ -12,6 +12,7 @@
     'constraints' => [
         'depends' => [
             'typo3' => '12.4.7',
+            'frontend' => '12.4.7',
         ],
         'conflicts' => [],
         'suggests' => [
diff --git a/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlExports/irre-records.xml b/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlExports/irre-records.xml
index 0bd25403ffde..47e7575e5990 100644
--- a/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlExports/irre-records.xml
+++ b/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlExports/irre-records.xml
@@ -140,19 +140,19 @@
 					<softrefs type="array"></softrefs>
 				</rec>
 			</table>
-			<table index="tx_testirremm_hotel" type="array">
+			<table index="tx_testirreforeignfield_hotel" type="array">
 				<rec index="1" type="array">
 					<uid>1</uid>
 					<pid>1</pid>
-					<title>Hotel 1 (m:n (MM) ASym)</title>
+					<title>Hotel 1 (nff)</title>
 					<relations index="rels" type="array">
-						<element index="tx_testirremm_offer:1" type="array">
+						<element index="tx_testirreforeignfield_offer:1" type="array">
 							<id>1</id>
-							<table>tx_testirremm_offer</table>
+							<table>tx_testirreforeignfield_offer</table>
 						</element>
-						<element index="tx_testirremm_offer:2" type="array">
+						<element index="tx_testirreforeignfield_offer:2" type="array">
 							<id>2</id>
-							<table>tx_testirremm_offer</table>
+							<table>tx_testirreforeignfield_offer</table>
 						</element>
 					</relations>
 					<softrefs type="array"></softrefs>
@@ -160,25 +160,29 @@
 				<rec index="2" type="array">
 					<uid>2</uid>
 					<pid>1</pid>
-					<title>Hotel 2 (m:n (MM) ASym)</title>
+					<title>Hotel 2 (nff)</title>
 					<relations index="rels" type="array">
-						<element index="tx_testirremm_offer:3" type="array">
+						<element index="tx_testirreforeignfield_offer:3" type="array">
 							<id>3</id>
-							<table>tx_testirremm_offer</table>
+							<table>tx_testirreforeignfield_offer</table>
 						</element>
 					</relations>
 					<softrefs type="array"></softrefs>
 				</rec>
 			</table>
-			<table index="tx_testirremm_offer" type="array">
-				<rec index="3" type="array">
-					<uid>3</uid>
+			<table index="tx_testirreforeignfield_offer" type="array">
+				<rec index="1" type="array">
+					<uid>1</uid>
 					<pid>1</pid>
-					<title>Offer 2.1 (m:n (MM) ASym)</title>
+					<title>Offer 1.1 (nff)</title>
 					<relations index="rels" type="array">
-						<element index="tx_testirremm_price:3" type="array">
-							<id>3</id>
-							<table>tx_testirremm_price</table>
+						<element index="tx_testirreforeignfield_price:1" type="array">
+							<id>1</id>
+							<table>tx_testirreforeignfield_price</table>
+						</element>
+						<element index="tx_testirreforeignfield_price:2" type="array">
+							<id>2</id>
+							<table>tx_testirreforeignfield_price</table>
 						</element>
 					</relations>
 					<softrefs type="array"></softrefs>
@@ -186,106 +190,71 @@
 				<rec index="2" type="array">
 					<uid>2</uid>
 					<pid>1</pid>
-					<title>Offer 1.2 (m:n (MM) ASym)</title>
+					<title>Offer 1.2 (nff)</title>
 					<relations index="rels" type="array">
-						<element index="tx_testirremm_price:2" type="array">
-							<id>2</id>
-							<table>tx_testirremm_price</table>
+						<element index="tx_testirreforeignfield_price:3" type="array">
+							<id>3</id>
+							<table>tx_testirreforeignfield_price</table>
 						</element>
 					</relations>
 					<softrefs type="array"></softrefs>
 				</rec>
-				<rec index="1" type="array">
-					<uid>1</uid>
+				<rec index="3" type="array">
+					<uid>3</uid>
 					<pid>1</pid>
-					<title>Offer 1.1 (m:n (MM) ASym)</title>
+					<title>Offer 2.1 (nff)</title>
 					<relations index="rels" type="array">
-						<element index="tx_testirremm_price:1" type="array">
-							<id>1</id>
-							<table>tx_testirremm_price</table>
+						<element index="tx_testirreforeignfield_price:4" type="array">
+							<id>4</id>
+							<table>tx_testirreforeignfield_price</table>
 						</element>
 					</relations>
 					<softrefs type="array"></softrefs>
 				</rec>
 			</table>
-			<table index="tx_testirremm_price" type="array">
-				<rec index="3" type="array">
-					<uid>3</uid>
-					<pid>1</pid>
-					<title>Price (m:n (MM) ASym)</title>
-					<relations index="rels" type="array"></relations>
-					<softrefs type="array"></softrefs>
-				</rec>
-				<rec index="2" type="array">
-					<uid>2</uid>
-					<pid>1</pid>
-					<title>Price 1.2.2 (m:n (MM) ASym)</title>
-					<relations index="rels" type="array"></relations>
-					<softrefs type="array"></softrefs>
-				</rec>
+			<table index="tx_testirreforeignfield_price" type="array">
 				<rec index="1" type="array">
 					<uid>1</uid>
 					<pid>1</pid>
-					<title>Price 1.1.1 (m:n (MM) ASym)</title>
+					<title>Price 1.1.1 (nff)</title>
 					<relations index="rels" type="array"></relations>
 					<softrefs type="array"></softrefs>
 				</rec>
-			</table>
-			<table index="tx_testirremnsymmetric_hotel" type="array">
 				<rec index="2" type="array">
 					<uid>2</uid>
 					<pid>1</pid>
-					<title>Hotel Branch 1.1 (mm sym)</title>
-					<relations index="rels" type="array">
-						<element index="tx_testirremnsymmetric_hotel_rel:1" type="array">
-							<id>1</id>
-							<table>tx_testirremnsymmetric_hotel_rel</table>
-						</element>
-					</relations>
+					<title>Price 1.1.2 (nff)</title>
+					<relations index="rels" type="array"></relations>
 					<softrefs type="array"></softrefs>
 				</rec>
 				<rec index="3" type="array">
 					<uid>3</uid>
 					<pid>1</pid>
-					<title>Hotel branch 1.2 (mm sym)</title>
-					<relations index="rels" type="array">
-						<element index="tx_testirremnsymmetric_hotel_rel:2" type="array">
-							<id>2</id>
-							<table>tx_testirremnsymmetric_hotel_rel</table>
-						</element>
-					</relations>
+					<title>Price 1.2.1 (nff)</title>
+					<relations index="rels" type="array"></relations>
 					<softrefs type="array"></softrefs>
 				</rec>
-				<rec index="1" type="array">
-					<uid>1</uid>
+				<rec index="4" type="array">
+					<uid>4</uid>
 					<pid>1</pid>
-					<title>Hotel 1 (mm sym)</title>
-					<relations index="rels" type="array">
-						<element index="tx_testirremnsymmetric_hotel_rel:1" type="array">
-							<id>1</id>
-							<table>tx_testirremnsymmetric_hotel_rel</table>
-						</element>
-						<element index="tx_testirremnsymmetric_hotel_rel:2" type="array">
-							<id>2</id>
-							<table>tx_testirremnsymmetric_hotel_rel</table>
-						</element>
-					</relations>
+					<title>Price 2.1.1 (nff)</title>
+					<relations index="rels" type="array"></relations>
 					<softrefs type="array"></softrefs>
 				</rec>
 			</table>
-			<table index="tx_testirremnsymmetric_hotel_rel" type="array">
+			<table index="tx_testirremm_hotel" type="array">
 				<rec index="1" type="array">
 					<uid>1</uid>
 					<pid>1</pid>
-					<title>1</title>
+					<title>Hotel 1 (m:n (MM) ASym)</title>
 					<relations index="rels" type="array">
-						<element index="tx_testirremnsymmetric_hotel:1" type="array">
+						<element index="tx_testirremm_offer:1" type="array">
 							<id>1</id>
-							<table>tx_testirremnsymmetric_hotel</table>
+							<table>tx_testirremm_offer</table>
 						</element>
-						<element index="tx_testirremnsymmetric_hotel:2" type="array">
+						<element index="tx_testirremm_offer:2" type="array">
 							<id>2</id>
-							<table>tx_testirremnsymmetric_hotel</table>
+							<table>tx_testirremm_offer</table>
 						</element>
 					</relations>
 					<softrefs type="array"></softrefs>
@@ -293,33 +262,25 @@
 				<rec index="2" type="array">
 					<uid>2</uid>
 					<pid>1</pid>
-					<title>2</title>
+					<title>Hotel 2 (m:n (MM) ASym)</title>
 					<relations index="rels" type="array">
-						<element index="tx_testirremnsymmetric_hotel:1" type="array">
-							<id>1</id>
-							<table>tx_testirremnsymmetric_hotel</table>
-						</element>
-						<element index="tx_testirremnsymmetric_hotel:3" type="array">
+						<element index="tx_testirremm_offer:3" type="array">
 							<id>3</id>
-							<table>tx_testirremnsymmetric_hotel</table>
+							<table>tx_testirremm_offer</table>
 						</element>
 					</relations>
 					<softrefs type="array"></softrefs>
 				</rec>
 			</table>
-			<table index="tx_testirreforeignfield_hotel" type="array">
-				<rec index="1" type="array">
-					<uid>1</uid>
+			<table index="tx_testirremm_offer" type="array">
+				<rec index="3" type="array">
+					<uid>3</uid>
 					<pid>1</pid>
-					<title>Hotel 1 (nff)</title>
+					<title>Offer 2.1 (m:n (MM) ASym)</title>
 					<relations index="rels" type="array">
-						<element index="tx_testirreforeignfield_offer:1" type="array">
-							<id>1</id>
-							<table>tx_testirreforeignfield_offer</table>
-						</element>
-						<element index="tx_testirreforeignfield_offer:2" type="array">
-							<id>2</id>
-							<table>tx_testirreforeignfield_offer</table>
+						<element index="tx_testirremm_price:3" type="array">
+							<id>3</id>
+							<table>tx_testirremm_price</table>
 						</element>
 					</relations>
 					<softrefs type="array"></softrefs>
@@ -327,84 +288,47 @@
 				<rec index="2" type="array">
 					<uid>2</uid>
 					<pid>1</pid>
-					<title>Hotel 2 (nff)</title>
+					<title>Offer 1.2 (m:n (MM) ASym)</title>
 					<relations index="rels" type="array">
-						<element index="tx_testirreforeignfield_offer:3" type="array">
-							<id>3</id>
-							<table>tx_testirreforeignfield_offer</table>
+						<element index="tx_testirremm_price:2" type="array">
+							<id>2</id>
+							<table>tx_testirremm_price</table>
 						</element>
 					</relations>
 					<softrefs type="array"></softrefs>
 				</rec>
-			</table>
-			<table index="tx_testirreforeignfield_offer" type="array">
 				<rec index="1" type="array">
 					<uid>1</uid>
 					<pid>1</pid>
-					<title>Offer 1.1 (nff)</title>
+					<title>Offer 1.1 (m:n (MM) ASym)</title>
 					<relations index="rels" type="array">
-						<element index="tx_testirreforeignfield_price:1" type="array">
+						<element index="tx_testirremm_price:1" type="array">
 							<id>1</id>
-							<table>tx_testirreforeignfield_price</table>
-						</element>
-						<element index="tx_testirreforeignfield_price:2" type="array">
-							<id>2</id>
-							<table>tx_testirreforeignfield_price</table>
-						</element>
-					</relations>
-					<softrefs type="array"></softrefs>
-				</rec>
-				<rec index="2" type="array">
-					<uid>2</uid>
-					<pid>1</pid>
-					<title>Offer 1.2 (nff)</title>
-					<relations index="rels" type="array">
-						<element index="tx_testirreforeignfield_price:3" type="array">
-							<id>3</id>
-							<table>tx_testirreforeignfield_price</table>
+							<table>tx_testirremm_price</table>
 						</element>
 					</relations>
 					<softrefs type="array"></softrefs>
 				</rec>
+			</table>
+			<table index="tx_testirremm_price" type="array">
 				<rec index="3" type="array">
 					<uid>3</uid>
 					<pid>1</pid>
-					<title>Offer 2.1 (nff)</title>
-					<relations index="rels" type="array">
-						<element index="tx_testirreforeignfield_price:4" type="array">
-							<id>4</id>
-							<table>tx_testirreforeignfield_price</table>
-						</element>
-					</relations>
-					<softrefs type="array"></softrefs>
-				</rec>
-			</table>
-			<table index="tx_testirreforeignfield_price" type="array">
-				<rec index="1" type="array">
-					<uid>1</uid>
-					<pid>1</pid>
-					<title>Price 1.1.1 (nff)</title>
+					<title>Price (m:n (MM) ASym)</title>
 					<relations index="rels" type="array"></relations>
 					<softrefs type="array"></softrefs>
 				</rec>
 				<rec index="2" type="array">
 					<uid>2</uid>
 					<pid>1</pid>
-					<title>Price 1.1.2 (nff)</title>
-					<relations index="rels" type="array"></relations>
-					<softrefs type="array"></softrefs>
-				</rec>
-				<rec index="3" type="array">
-					<uid>3</uid>
-					<pid>1</pid>
-					<title>Price 1.2.1 (nff)</title>
+					<title>Price 1.2.2 (m:n (MM) ASym)</title>
 					<relations index="rels" type="array"></relations>
 					<softrefs type="array"></softrefs>
 				</rec>
-				<rec index="4" type="array">
-					<uid>4</uid>
+				<rec index="1" type="array">
+					<uid>1</uid>
 					<pid>1</pid>
-					<title>Price 2.1.1 (nff)</title>
+					<title>Price 1.1.1 (m:n (MM) ASym)</title>
 					<relations index="rels" type="array"></relations>
 					<softrefs type="array"></softrefs>
 				</rec>
@@ -597,53 +521,106 @@
 					<softrefs type="array"></softrefs>
 				</rec>
 			</table>
-		</records>
-		<pid_lookup type="array">
-			<page_contents index="0" type="array">
-				<table index="pages" type="array">
-					<item index="1">1</item>
-				</table>
-			</page_contents>
-			<page_contents index="1" type="array">
-				<table index="tt_content" type="array">
-					<item index="1">1</item>
-				</table>
-				<table index="tx_testirrecsv_hotel" type="array">
-					<item index="2">1</item>
-					<item index="1">1</item>
-				</table>
-				<table index="tx_testirrecsv_offer" type="array">
-					<item index="3">1</item>
-					<item index="2">1</item>
-					<item index="1">1</item>
-				</table>
-				<table index="tx_testirrecsv_price" type="array">
-					<item index="3">1</item>
-					<item index="2">1</item>
-					<item index="1">1</item>
-				</table>
-				<table index="tx_testirremm_hotel" type="array">
-					<item index="1">1</item>
-					<item index="2">1</item>
-				</table>
-				<table index="tx_testirremm_offer" type="array">
-					<item index="3">1</item>
-					<item index="2">1</item>
-					<item index="1">1</item>
-				</table>
-				<table index="tx_testirremm_price" type="array">
-					<item index="3">1</item>
-					<item index="2">1</item>
-					<item index="1">1</item>
-				</table>
-				<table index="tx_testirremnsymmetric_hotel" type="array">
+			<table index="tx_testirremnsymmetric_hotel" type="array">
+				<rec index="2" type="array">
+					<uid>2</uid>
+					<pid>1</pid>
+					<title>Hotel Branch 1.1 (mm sym)</title>
+					<relations index="rels" type="array">
+						<element index="tx_testirremnsymmetric_hotel_rel:1" type="array">
+							<id>1</id>
+							<table>tx_testirremnsymmetric_hotel_rel</table>
+						</element>
+					</relations>
+					<softrefs type="array"></softrefs>
+				</rec>
+				<rec index="3" type="array">
+					<uid>3</uid>
+					<pid>1</pid>
+					<title>Hotel branch 1.2 (mm sym)</title>
+					<relations index="rels" type="array">
+						<element index="tx_testirremnsymmetric_hotel_rel:2" type="array">
+							<id>2</id>
+							<table>tx_testirremnsymmetric_hotel_rel</table>
+						</element>
+					</relations>
+					<softrefs type="array"></softrefs>
+				</rec>
+				<rec index="1" type="array">
+					<uid>1</uid>
+					<pid>1</pid>
+					<title>Hotel 1 (mm sym)</title>
+					<relations index="rels" type="array">
+						<element index="tx_testirremnsymmetric_hotel_rel:1" type="array">
+							<id>1</id>
+							<table>tx_testirremnsymmetric_hotel_rel</table>
+						</element>
+						<element index="tx_testirremnsymmetric_hotel_rel:2" type="array">
+							<id>2</id>
+							<table>tx_testirremnsymmetric_hotel_rel</table>
+						</element>
+					</relations>
+					<softrefs type="array"></softrefs>
+				</rec>
+			</table>
+			<table index="tx_testirremnsymmetric_hotel_rel" type="array">
+				<rec index="1" type="array">
+					<uid>1</uid>
+					<pid>1</pid>
+					<title>1</title>
+					<relations index="rels" type="array">
+						<element index="tx_testirremnsymmetric_hotel:1" type="array">
+							<id>1</id>
+							<table>tx_testirremnsymmetric_hotel</table>
+						</element>
+						<element index="tx_testirremnsymmetric_hotel:2" type="array">
+							<id>2</id>
+							<table>tx_testirremnsymmetric_hotel</table>
+						</element>
+					</relations>
+					<softrefs type="array"></softrefs>
+				</rec>
+				<rec index="2" type="array">
+					<uid>2</uid>
+					<pid>1</pid>
+					<title>2</title>
+					<relations index="rels" type="array">
+						<element index="tx_testirremnsymmetric_hotel:1" type="array">
+							<id>1</id>
+							<table>tx_testirremnsymmetric_hotel</table>
+						</element>
+						<element index="tx_testirremnsymmetric_hotel:3" type="array">
+							<id>3</id>
+							<table>tx_testirremnsymmetric_hotel</table>
+						</element>
+					</relations>
+					<softrefs type="array"></softrefs>
+				</rec>
+			</table>
+		</records>
+		<pid_lookup type="array">
+			<page_contents index="0" type="array">
+				<table index="pages" type="array">
+					<item index="1">1</item>
+				</table>
+			</page_contents>
+			<page_contents index="1" type="array">
+				<table index="tt_content" type="array">
+					<item index="1">1</item>
+				</table>
+				<table index="tx_testirrecsv_hotel" type="array">
 					<item index="2">1</item>
-					<item index="3">1</item>
 					<item index="1">1</item>
 				</table>
-				<table index="tx_testirremnsymmetric_hotel_rel" type="array">
+				<table index="tx_testirrecsv_offer" type="array">
+					<item index="3">1</item>
+					<item index="2">1</item>
 					<item index="1">1</item>
+				</table>
+				<table index="tx_testirrecsv_price" type="array">
+					<item index="3">1</item>
 					<item index="2">1</item>
+					<item index="1">1</item>
 				</table>
 				<table index="tx_testirreforeignfield_hotel" type="array">
 					<item index="1">1</item>
@@ -660,6 +637,20 @@
 					<item index="3">1</item>
 					<item index="4">1</item>
 				</table>
+				<table index="tx_testirremm_hotel" type="array">
+					<item index="1">1</item>
+					<item index="2">1</item>
+				</table>
+				<table index="tx_testirremm_offer" type="array">
+					<item index="3">1</item>
+					<item index="2">1</item>
+					<item index="1">1</item>
+				</table>
+				<table index="tx_testirremm_price" type="array">
+					<item index="3">1</item>
+					<item index="2">1</item>
+					<item index="1">1</item>
+				</table>
 				<table index="tx_testirremnattributeinline_hotel" type="array">
 					<item index="1">1</item>
 				</table>
@@ -687,6 +678,15 @@
 					<item index="1">1</item>
 					<item index="2">1</item>
 				</table>
+				<table index="tx_testirremnsymmetric_hotel" type="array">
+					<item index="2">1</item>
+					<item index="3">1</item>
+					<item index="1">1</item>
+				</table>
+				<table index="tx_testirremnsymmetric_hotel_rel" type="array">
+					<item index="1">1</item>
+					<item index="2">1</item>
+				</table>
 			</page_contents>
 		</pid_lookup>
 	</header>
@@ -910,16 +910,19 @@
 			</fieldlist>
 			<related index="rels" type="array"></related>
 		</tablerow>
-		<tablerow index="tx_testirremm_hotel:1" type="array">
+		<tablerow index="tx_testirreforeignfield_hotel:1" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">1</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">256</field>
+				<field index="sorting" type="integer">1</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="title">Hotel 1 (m:n (MM) ASym)</field>
+				<field index="parentid" type="integer">1</field>
+				<field index="parenttable">tt_content</field>
+				<field index="parentidentifier">1nff.hotels</field>
+				<field index="title">Hotel 1 (nff)</field>
 				<field index="offers" type="integer">2</field>
 			</fieldlist>
 			<related index="rels" type="array">
@@ -928,26 +931,29 @@
 					<relations index="itemArray" type="array">
 						<element index="0" type="array">
 							<id>1</id>
-							<table>tx_testirremm_offer</table>
+							<table>tx_testirreforeignfield_offer</table>
 						</element>
 						<element index="1" type="array">
 							<id>2</id>
-							<table>tx_testirremm_offer</table>
+							<table>tx_testirreforeignfield_offer</table>
 						</element>
 					</relations>
 				</field>
 			</related>
 		</tablerow>
-		<tablerow index="tx_testirremm_hotel:2" type="array">
+		<tablerow index="tx_testirreforeignfield_hotel:2" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">2</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">512</field>
+				<field index="sorting" type="integer">2</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="title">Hotel 2 (m:n (MM) ASym)</field>
+				<field index="parentid" type="integer">1</field>
+				<field index="parenttable">tt_content</field>
+				<field index="parentidentifier">1nff.hotels</field>
+				<field index="title">Hotel 2 (nff)</field>
 				<field index="offers" type="integer">1</field>
 			</fieldlist>
 			<related index="rels" type="array">
@@ -956,48 +962,56 @@
 					<relations index="itemArray" type="array">
 						<element index="0" type="array">
 							<id>3</id>
-							<table>tx_testirremm_offer</table>
+							<table>tx_testirreforeignfield_offer</table>
 						</element>
 					</relations>
 				</field>
 			</related>
 		</tablerow>
-		<tablerow index="tx_testirremm_offer:3" type="array">
+		<tablerow index="tx_testirreforeignfield_offer:1" type="array">
 			<fieldlist index="data" type="array">
-				<field index="uid" type="integer">3</field>
+				<field index="uid" type="integer">1</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">64</field>
+				<field index="sorting" type="integer">1</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="title">Offer 2.1 (m:n (MM) ASym)</field>
-				<field index="hotels" type="integer">0</field>
-				<field index="prices" type="integer">1</field>
+				<field index="parentid" type="integer">1</field>
+				<field index="parenttable">tx_testirreforeignfield_hotel</field>
+				<field index="parentidentifier"></field>
+				<field index="title">Offer 1.1 (nff)</field>
+				<field index="prices" type="integer">2</field>
 			</fieldlist>
 			<related index="rels" type="array">
 				<field index="prices" type="array">
 					<type>db</type>
 					<relations index="itemArray" type="array">
 						<element index="0" type="array">
-							<id>3</id>
-							<table>tx_testirremm_price</table>
+							<id>1</id>
+							<table>tx_testirreforeignfield_price</table>
+						</element>
+						<element index="1" type="array">
+							<id>2</id>
+							<table>tx_testirreforeignfield_price</table>
 						</element>
 					</relations>
 				</field>
 			</related>
 		</tablerow>
-		<tablerow index="tx_testirremm_offer:2" type="array">
+		<tablerow index="tx_testirreforeignfield_offer:2" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">2</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">128</field>
+				<field index="sorting" type="integer">2</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="title">Offer 1.2 (m:n (MM) ASym)</field>
-				<field index="hotels" type="integer">0</field>
+				<field index="parentid" type="integer">1</field>
+				<field index="parenttable">tx_testirreforeignfield_hotel</field>
+				<field index="parentidentifier"></field>
+				<field index="title">Offer 1.2 (nff)</field>
 				<field index="prices" type="integer">1</field>
 			</fieldlist>
 			<related index="rels" type="array">
@@ -1005,24 +1019,26 @@
 					<type>db</type>
 					<relations index="itemArray" type="array">
 						<element index="0" type="array">
-							<id>2</id>
-							<table>tx_testirremm_price</table>
+							<id>3</id>
+							<table>tx_testirreforeignfield_price</table>
 						</element>
 					</relations>
 				</field>
 			</related>
 		</tablerow>
-		<tablerow index="tx_testirremm_offer:1" type="array">
+		<tablerow index="tx_testirreforeignfield_offer:3" type="array">
 			<fieldlist index="data" type="array">
-				<field index="uid" type="integer">1</field>
+				<field index="uid" type="integer">3</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">256</field>
+				<field index="sorting" type="integer">3</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="title">Offer 1.1 (m:n (MM) ASym)</field>
-				<field index="hotels" type="integer">0</field>
+				<field index="parentid" type="integer">2</field>
+				<field index="parenttable">tx_testirreforeignfield_hotel</field>
+				<field index="parentidentifier"></field>
+				<field index="title">Offer 2.1 (nff)</field>
 				<field index="prices" type="integer">1</field>
 			</fieldlist>
 			<related index="rels" type="array">
@@ -1030,107 +1046,82 @@
 					<type>db</type>
 					<relations index="itemArray" type="array">
 						<element index="0" type="array">
-							<id>1</id>
-							<table>tx_testirremm_price</table>
+							<id>4</id>
+							<table>tx_testirreforeignfield_price</table>
 						</element>
 					</relations>
 				</field>
 			</related>
 		</tablerow>
-		<tablerow index="tx_testirremm_price:3" type="array">
+		<tablerow index="tx_testirreforeignfield_price:1" type="array">
 			<fieldlist index="data" type="array">
-				<field index="uid" type="integer">3</field>
+				<field index="uid" type="integer">1</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">64</field>
+				<field index="sorting" type="integer">1</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="title">Price (m:n (MM) ASym)</field>
-				<field index="price">223.00</field>
-				<field index="offers" type="integer">0</field>
+				<field index="parentid" type="integer">1</field>
+				<field index="parenttable">tx_testirreforeignfield_offer</field>
+				<field index="parentidentifier"></field>
+				<field index="title">Price 1.1.1 (nff)</field>
+				<field index="price">4.00</field>
 			</fieldlist>
 			<related index="rels" type="array"></related>
 		</tablerow>
-		<tablerow index="tx_testirremm_price:2" type="array">
+		<tablerow index="tx_testirreforeignfield_price:2" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">2</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">128</field>
+				<field index="sorting" type="integer">2</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="title">Price 1.2.2 (m:n (MM) ASym)</field>
-				<field index="price">567.00</field>
-				<field index="offers" type="integer">0</field>
+				<field index="parentid" type="integer">1</field>
+				<field index="parenttable">tx_testirreforeignfield_offer</field>
+				<field index="parentidentifier"></field>
+				<field index="title">Price 1.1.2 (nff)</field>
+				<field index="price">869.00</field>
 			</fieldlist>
 			<related index="rels" type="array"></related>
 		</tablerow>
-		<tablerow index="tx_testirremm_price:1" type="array">
+		<tablerow index="tx_testirreforeignfield_price:3" type="array">
 			<fieldlist index="data" type="array">
-				<field index="uid" type="integer">1</field>
+				<field index="uid" type="integer">3</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">256</field>
+				<field index="sorting" type="integer">3</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="title">Price 1.1.1 (m:n (MM) ASym)</field>
-				<field index="price">567.00</field>
-				<field index="offers" type="integer">0</field>
+				<field index="parentid" type="integer">2</field>
+				<field index="parenttable">tx_testirreforeignfield_offer</field>
+				<field index="parentidentifier"></field>
+				<field index="title">Price 1.2.1 (nff)</field>
+				<field index="price">678.00</field>
 			</fieldlist>
 			<related index="rels" type="array"></related>
 		</tablerow>
-		<tablerow index="tx_testirremnsymmetric_hotel:2" type="array">
-			<fieldlist index="data" type="array">
-				<field index="uid" type="integer">2</field>
-				<field index="pid" type="integer">1</field>
-				<field index="deleted" type="integer">0</field>
-				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">128</field>
-				<field index="sys_language_uid" type="integer">0</field>
-				<field index="l18n_parent" type="integer">0</field>
-				<field index="title">Hotel Branch 1.1 (mm sym)</field>
-				<field index="branches" type="integer">1</field>
-			</fieldlist>
-			<related index="rels" type="array">
-				<field index="branches" type="array">
-					<type>db</type>
-					<relations index="itemArray" type="array">
-						<element index="0" type="array">
-							<id>1</id>
-							<table>tx_testirremnsymmetric_hotel_rel</table>
-						</element>
-					</relations>
-				</field>
-			</related>
-		</tablerow>
-		<tablerow index="tx_testirremnsymmetric_hotel:3" type="array">
+		<tablerow index="tx_testirreforeignfield_price:4" type="array">
 			<fieldlist index="data" type="array">
-				<field index="uid" type="integer">3</field>
+				<field index="uid" type="integer">4</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">192</field>
+				<field index="sorting" type="integer">4</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="title">Hotel branch 1.2 (mm sym)</field>
-				<field index="branches" type="integer">0</field>
+				<field index="parentid" type="integer">3</field>
+				<field index="parenttable">tx_testirreforeignfield_offer</field>
+				<field index="parentidentifier"></field>
+				<field index="title">Price 2.1.1 (nff)</field>
+				<field index="price">5467567.00</field>
 			</fieldlist>
-			<related index="rels" type="array">
-				<field index="branches" type="array">
-					<type>db</type>
-					<relations index="itemArray" type="array">
-						<element index="0" type="array">
-							<id>2</id>
-							<table>tx_testirremnsymmetric_hotel_rel</table>
-						</element>
-					</relations>
-				</field>
-			</related>
+			<related index="rels" type="array"></related>
 		</tablerow>
-		<tablerow index="tx_testirremnsymmetric_hotel:1" type="array">
+		<tablerow index="tx_testirremm_hotel:1" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">1</field>
 				<field index="pid" type="integer">1</field>
@@ -1139,106 +1130,7 @@
 				<field index="sorting" type="integer">256</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="title">Hotel 1 (mm sym)</field>
-				<field index="branches" type="integer">2</field>
-			</fieldlist>
-			<related index="rels" type="array">
-				<field index="branches" type="array">
-					<type>db</type>
-					<relations index="itemArray" type="array">
-						<element index="0" type="array">
-							<id>1</id>
-							<table>tx_testirremnsymmetric_hotel_rel</table>
-						</element>
-						<element index="1" type="array">
-							<id>2</id>
-							<table>tx_testirremnsymmetric_hotel_rel</table>
-						</element>
-					</relations>
-				</field>
-			</related>
-		</tablerow>
-		<tablerow index="tx_testirremnsymmetric_hotel_rel:1" type="array">
-			<fieldlist index="data" type="array">
-				<field index="uid" type="integer">1</field>
-				<field index="pid" type="integer">1</field>
-				<field index="deleted" type="integer">0</field>
-				<field index="hidden" type="integer">0</field>
-				<field index="sys_language_uid" type="integer">0</field>
-				<field index="l18n_parent" type="integer">0</field>
-				<field index="hotelid" type="integer">1</field>
-				<field index="branchid" type="integer">2</field>
-				<field index="hotelsort" type="integer">1</field>
-				<field index="branchsort" type="integer">1</field>
-			</fieldlist>
-			<related index="rels" type="array">
-				<field index="hotelid" type="array">
-					<type>db</type>
-					<relations index="itemArray" type="array">
-						<element index="0" type="array">
-							<id>1</id>
-							<table>tx_testirremnsymmetric_hotel</table>
-						</element>
-					</relations>
-				</field>
-				<field index="branchid" type="array">
-					<type>db</type>
-					<relations index="itemArray" type="array">
-						<element index="0" type="array">
-							<id>2</id>
-							<table>tx_testirremnsymmetric_hotel</table>
-						</element>
-					</relations>
-				</field>
-			</related>
-		</tablerow>
-		<tablerow index="tx_testirremnsymmetric_hotel_rel:2" type="array">
-			<fieldlist index="data" type="array">
-				<field index="uid" type="integer">2</field>
-				<field index="pid" type="integer">1</field>
-				<field index="deleted" type="integer">0</field>
-				<field index="hidden" type="integer">0</field>
-				<field index="sys_language_uid" type="integer">0</field>
-				<field index="l18n_parent" type="integer">0</field>
-				<field index="hotelid" type="integer">1</field>
-				<field index="branchid" type="integer">3</field>
-				<field index="hotelsort" type="integer">2</field>
-				<field index="branchsort" type="integer">0</field>
-			</fieldlist>
-			<related index="rels" type="array">
-				<field index="hotelid" type="array">
-					<type>db</type>
-					<relations index="itemArray" type="array">
-						<element index="0" type="array">
-							<id>1</id>
-							<table>tx_testirremnsymmetric_hotel</table>
-						</element>
-					</relations>
-				</field>
-				<field index="branchid" type="array">
-					<type>db</type>
-					<relations index="itemArray" type="array">
-						<element index="0" type="array">
-							<id>3</id>
-							<table>tx_testirremnsymmetric_hotel</table>
-						</element>
-					</relations>
-				</field>
-			</related>
-		</tablerow>
-		<tablerow index="tx_testirreforeignfield_hotel:1" type="array">
-			<fieldlist index="data" type="array">
-				<field index="uid" type="integer">1</field>
-				<field index="pid" type="integer">1</field>
-				<field index="deleted" type="integer">0</field>
-				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">1</field>
-				<field index="sys_language_uid" type="integer">0</field>
-				<field index="l18n_parent" type="integer">0</field>
-				<field index="parentid" type="integer">1</field>
-				<field index="parenttable">tt_content</field>
-				<field index="parentidentifier">1nff.hotels</field>
-				<field index="title">Hotel 1 (nff)</field>
+				<field index="title">Hotel 1 (m:n (MM) ASym)</field>
 				<field index="offers" type="integer">2</field>
 			</fieldlist>
 			<related index="rels" type="array">
@@ -1247,29 +1139,26 @@
 					<relations index="itemArray" type="array">
 						<element index="0" type="array">
 							<id>1</id>
-							<table>tx_testirreforeignfield_offer</table>
+							<table>tx_testirremm_offer</table>
 						</element>
 						<element index="1" type="array">
 							<id>2</id>
-							<table>tx_testirreforeignfield_offer</table>
+							<table>tx_testirremm_offer</table>
 						</element>
 					</relations>
 				</field>
 			</related>
 		</tablerow>
-		<tablerow index="tx_testirreforeignfield_hotel:2" type="array">
+		<tablerow index="tx_testirremm_hotel:2" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">2</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">2</field>
+				<field index="sorting" type="integer">512</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="parentid" type="integer">1</field>
-				<field index="parenttable">tt_content</field>
-				<field index="parentidentifier">1nff.hotels</field>
-				<field index="title">Hotel 2 (nff)</field>
+				<field index="title">Hotel 2 (m:n (MM) ASym)</field>
 				<field index="offers" type="integer">1</field>
 			</fieldlist>
 			<related index="rels" type="array">
@@ -1278,56 +1167,48 @@
 					<relations index="itemArray" type="array">
 						<element index="0" type="array">
 							<id>3</id>
-							<table>tx_testirreforeignfield_offer</table>
+							<table>tx_testirremm_offer</table>
 						</element>
 					</relations>
 				</field>
 			</related>
 		</tablerow>
-		<tablerow index="tx_testirreforeignfield_offer:1" type="array">
+		<tablerow index="tx_testirremm_offer:3" type="array">
 			<fieldlist index="data" type="array">
-				<field index="uid" type="integer">1</field>
+				<field index="uid" type="integer">3</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">1</field>
+				<field index="sorting" type="integer">64</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="parentid" type="integer">1</field>
-				<field index="parenttable">tx_testirreforeignfield_hotel</field>
-				<field index="parentidentifier"></field>
-				<field index="title">Offer 1.1 (nff)</field>
-				<field index="prices" type="integer">2</field>
+				<field index="title">Offer 2.1 (m:n (MM) ASym)</field>
+				<field index="hotels" type="integer">0</field>
+				<field index="prices" type="integer">1</field>
 			</fieldlist>
 			<related index="rels" type="array">
 				<field index="prices" type="array">
 					<type>db</type>
 					<relations index="itemArray" type="array">
 						<element index="0" type="array">
-							<id>1</id>
-							<table>tx_testirreforeignfield_price</table>
-						</element>
-						<element index="1" type="array">
-							<id>2</id>
-							<table>tx_testirreforeignfield_price</table>
+							<id>3</id>
+							<table>tx_testirremm_price</table>
 						</element>
 					</relations>
 				</field>
 			</related>
 		</tablerow>
-		<tablerow index="tx_testirreforeignfield_offer:2" type="array">
+		<tablerow index="tx_testirremm_offer:2" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">2</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">2</field>
+				<field index="sorting" type="integer">128</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="parentid" type="integer">1</field>
-				<field index="parenttable">tx_testirreforeignfield_hotel</field>
-				<field index="parentidentifier"></field>
-				<field index="title">Offer 1.2 (nff)</field>
+				<field index="title">Offer 1.2 (m:n (MM) ASym)</field>
+				<field index="hotels" type="integer">0</field>
 				<field index="prices" type="integer">1</field>
 			</fieldlist>
 			<related index="rels" type="array">
@@ -1335,26 +1216,24 @@
 					<type>db</type>
 					<relations index="itemArray" type="array">
 						<element index="0" type="array">
-							<id>3</id>
-							<table>tx_testirreforeignfield_price</table>
+							<id>2</id>
+							<table>tx_testirremm_price</table>
 						</element>
 					</relations>
 				</field>
 			</related>
 		</tablerow>
-		<tablerow index="tx_testirreforeignfield_offer:3" type="array">
+		<tablerow index="tx_testirremm_offer:1" type="array">
 			<fieldlist index="data" type="array">
-				<field index="uid" type="integer">3</field>
+				<field index="uid" type="integer">1</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">3</field>
+				<field index="sorting" type="integer">256</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="parentid" type="integer">2</field>
-				<field index="parenttable">tx_testirreforeignfield_hotel</field>
-				<field index="parentidentifier"></field>
-				<field index="title">Offer 2.1 (nff)</field>
+				<field index="title">Offer 1.1 (m:n (MM) ASym)</field>
+				<field index="hotels" type="integer">0</field>
 				<field index="prices" type="integer">1</field>
 			</fieldlist>
 			<related index="rels" type="array">
@@ -1362,78 +1241,55 @@
 					<type>db</type>
 					<relations index="itemArray" type="array">
 						<element index="0" type="array">
-							<id>4</id>
-							<table>tx_testirreforeignfield_price</table>
+							<id>1</id>
+							<table>tx_testirremm_price</table>
 						</element>
 					</relations>
 				</field>
 			</related>
 		</tablerow>
-		<tablerow index="tx_testirreforeignfield_price:1" type="array">
+		<tablerow index="tx_testirremm_price:3" type="array">
 			<fieldlist index="data" type="array">
-				<field index="uid" type="integer">1</field>
+				<field index="uid" type="integer">3</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">1</field>
+				<field index="sorting" type="integer">64</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="parentid" type="integer">1</field>
-				<field index="parenttable">tx_testirreforeignfield_offer</field>
-				<field index="parentidentifier"></field>
-				<field index="title">Price 1.1.1 (nff)</field>
-				<field index="price">4.00</field>
+				<field index="title">Price (m:n (MM) ASym)</field>
+				<field index="price">223.00</field>
+				<field index="offers" type="integer">0</field>
 			</fieldlist>
 			<related index="rels" type="array"></related>
 		</tablerow>
-		<tablerow index="tx_testirreforeignfield_price:2" type="array">
+		<tablerow index="tx_testirremm_price:2" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">2</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">2</field>
-				<field index="sys_language_uid" type="integer">0</field>
-				<field index="l18n_parent" type="integer">0</field>
-				<field index="parentid" type="integer">1</field>
-				<field index="parenttable">tx_testirreforeignfield_offer</field>
-				<field index="parentidentifier"></field>
-				<field index="title">Price 1.1.2 (nff)</field>
-				<field index="price">869.00</field>
-			</fieldlist>
-			<related index="rels" type="array"></related>
-		</tablerow>
-		<tablerow index="tx_testirreforeignfield_price:3" type="array">
-			<fieldlist index="data" type="array">
-				<field index="uid" type="integer">3</field>
-				<field index="pid" type="integer">1</field>
-				<field index="deleted" type="integer">0</field>
-				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">3</field>
+				<field index="sorting" type="integer">128</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="parentid" type="integer">2</field>
-				<field index="parenttable">tx_testirreforeignfield_offer</field>
-				<field index="parentidentifier"></field>
-				<field index="title">Price 1.2.1 (nff)</field>
-				<field index="price">678.00</field>
+				<field index="title">Price 1.2.2 (m:n (MM) ASym)</field>
+				<field index="price">567.00</field>
+				<field index="offers" type="integer">0</field>
 			</fieldlist>
 			<related index="rels" type="array"></related>
 		</tablerow>
-		<tablerow index="tx_testirreforeignfield_price:4" type="array">
+		<tablerow index="tx_testirremm_price:1" type="array">
 			<fieldlist index="data" type="array">
-				<field index="uid" type="integer">4</field>
+				<field index="uid" type="integer">1</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">4</field>
+				<field index="sorting" type="integer">256</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="parentid" type="integer">3</field>
-				<field index="parenttable">tx_testirreforeignfield_offer</field>
-				<field index="parentidentifier"></field>
-				<field index="title">Price 2.1.1 (nff)</field>
-				<field index="price">5467567.00</field>
+				<field index="title">Price 1.1.1 (m:n (MM) ASym)</field>
+				<field index="price">567.00</field>
+				<field index="offers" type="integer">0</field>
 			</fieldlist>
 			<related index="rels" type="array"></related>
 		</tablerow>
@@ -1799,5 +1655,149 @@
 				</field>
 			</related>
 		</tablerow>
+		<tablerow index="tx_testirremnsymmetric_hotel:2" type="array">
+			<fieldlist index="data" type="array">
+				<field index="uid" type="integer">2</field>
+				<field index="pid" type="integer">1</field>
+				<field index="deleted" type="integer">0</field>
+				<field index="hidden" type="integer">0</field>
+				<field index="sorting" type="integer">128</field>
+				<field index="sys_language_uid" type="integer">0</field>
+				<field index="l18n_parent" type="integer">0</field>
+				<field index="title">Hotel Branch 1.1 (mm sym)</field>
+				<field index="branches" type="integer">1</field>
+			</fieldlist>
+			<related index="rels" type="array">
+				<field index="branches" type="array">
+					<type>db</type>
+					<relations index="itemArray" type="array">
+						<element index="0" type="array">
+							<id>1</id>
+							<table>tx_testirremnsymmetric_hotel_rel</table>
+						</element>
+					</relations>
+				</field>
+			</related>
+		</tablerow>
+		<tablerow index="tx_testirremnsymmetric_hotel:3" type="array">
+			<fieldlist index="data" type="array">
+				<field index="uid" type="integer">3</field>
+				<field index="pid" type="integer">1</field>
+				<field index="deleted" type="integer">0</field>
+				<field index="hidden" type="integer">0</field>
+				<field index="sorting" type="integer">192</field>
+				<field index="sys_language_uid" type="integer">0</field>
+				<field index="l18n_parent" type="integer">0</field>
+				<field index="title">Hotel branch 1.2 (mm sym)</field>
+				<field index="branches" type="integer">0</field>
+			</fieldlist>
+			<related index="rels" type="array">
+				<field index="branches" type="array">
+					<type>db</type>
+					<relations index="itemArray" type="array">
+						<element index="0" type="array">
+							<id>2</id>
+							<table>tx_testirremnsymmetric_hotel_rel</table>
+						</element>
+					</relations>
+				</field>
+			</related>
+		</tablerow>
+		<tablerow index="tx_testirremnsymmetric_hotel:1" type="array">
+			<fieldlist index="data" type="array">
+				<field index="uid" type="integer">1</field>
+				<field index="pid" type="integer">1</field>
+				<field index="deleted" type="integer">0</field>
+				<field index="hidden" type="integer">0</field>
+				<field index="sorting" type="integer">256</field>
+				<field index="sys_language_uid" type="integer">0</field>
+				<field index="l18n_parent" type="integer">0</field>
+				<field index="title">Hotel 1 (mm sym)</field>
+				<field index="branches" type="integer">2</field>
+			</fieldlist>
+			<related index="rels" type="array">
+				<field index="branches" type="array">
+					<type>db</type>
+					<relations index="itemArray" type="array">
+						<element index="0" type="array">
+							<id>1</id>
+							<table>tx_testirremnsymmetric_hotel_rel</table>
+						</element>
+						<element index="1" type="array">
+							<id>2</id>
+							<table>tx_testirremnsymmetric_hotel_rel</table>
+						</element>
+					</relations>
+				</field>
+			</related>
+		</tablerow>
+		<tablerow index="tx_testirremnsymmetric_hotel_rel:1" type="array">
+			<fieldlist index="data" type="array">
+				<field index="uid" type="integer">1</field>
+				<field index="pid" type="integer">1</field>
+				<field index="deleted" type="integer">0</field>
+				<field index="hidden" type="integer">0</field>
+				<field index="sys_language_uid" type="integer">0</field>
+				<field index="l18n_parent" type="integer">0</field>
+				<field index="hotelid" type="integer">1</field>
+				<field index="branchid" type="integer">2</field>
+				<field index="hotelsort" type="integer">1</field>
+				<field index="branchsort" type="integer">1</field>
+			</fieldlist>
+			<related index="rels" type="array">
+				<field index="hotelid" type="array">
+					<type>db</type>
+					<relations index="itemArray" type="array">
+						<element index="0" type="array">
+							<id>1</id>
+							<table>tx_testirremnsymmetric_hotel</table>
+						</element>
+					</relations>
+				</field>
+				<field index="branchid" type="array">
+					<type>db</type>
+					<relations index="itemArray" type="array">
+						<element index="0" type="array">
+							<id>2</id>
+							<table>tx_testirremnsymmetric_hotel</table>
+						</element>
+					</relations>
+				</field>
+			</related>
+		</tablerow>
+		<tablerow index="tx_testirremnsymmetric_hotel_rel:2" type="array">
+			<fieldlist index="data" type="array">
+				<field index="uid" type="integer">2</field>
+				<field index="pid" type="integer">1</field>
+				<field index="deleted" type="integer">0</field>
+				<field index="hidden" type="integer">0</field>
+				<field index="sys_language_uid" type="integer">0</field>
+				<field index="l18n_parent" type="integer">0</field>
+				<field index="hotelid" type="integer">1</field>
+				<field index="branchid" type="integer">3</field>
+				<field index="hotelsort" type="integer">2</field>
+				<field index="branchsort" type="integer">0</field>
+			</fieldlist>
+			<related index="rels" type="array">
+				<field index="hotelid" type="array">
+					<type>db</type>
+					<relations index="itemArray" type="array">
+						<element index="0" type="array">
+							<id>1</id>
+							<table>tx_testirremnsymmetric_hotel</table>
+						</element>
+					</relations>
+				</field>
+				<field index="branchid" type="array">
+					<type>db</type>
+					<relations index="itemArray" type="array">
+						<element index="0" type="array">
+							<id>3</id>
+							<table>tx_testirremnsymmetric_hotel</table>
+						</element>
+					</relations>
+				</field>
+			</related>
+		</tablerow>
 	</records>
 </T3RecordDocument>
\ No newline at end of file
diff --git a/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlImports/irre-records.xml b/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlImports/irre-records.xml
index c42f9ecbd8e2..a0f0b0c7c855 100644
--- a/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlImports/irre-records.xml
+++ b/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlImports/irre-records.xml
@@ -140,19 +140,19 @@
 					<softrefs type="array"></softrefs>
 				</rec>
 			</table>
-			<table index="tx_testirremm_hotel" type="array">
+			<table index="tx_testirreforeignfield_hotel" type="array">
 				<rec index="1" type="array">
 					<uid>1</uid>
 					<pid>1</pid>
-					<title>Hotel 1 (m:n (MM) ASym)</title>
+					<title>Hotel 1 (nff)</title>
 					<relations index="rels" type="array">
-						<element index="tx_testirremm_offer:1" type="array">
+						<element index="tx_testirreforeignfield_offer:1" type="array">
 							<id>1</id>
-							<table>tx_testirremm_offer</table>
+							<table>tx_testirreforeignfield_offer</table>
 						</element>
-						<element index="tx_testirremm_offer:2" type="array">
+						<element index="tx_testirreforeignfield_offer:2" type="array">
 							<id>2</id>
-							<table>tx_testirremm_offer</table>
+							<table>tx_testirreforeignfield_offer</table>
 						</element>
 					</relations>
 					<softrefs type="array"></softrefs>
@@ -160,132 +160,101 @@
 				<rec index="2" type="array">
 					<uid>2</uid>
 					<pid>1</pid>
-					<title>Hotel 2 (m:n (MM) ASym)</title>
+					<title>Hotel 2 (nff)</title>
 					<relations index="rels" type="array">
-						<element index="tx_testirremm_offer:3" type="array">
+						<element index="tx_testirreforeignfield_offer:3" type="array">
 							<id>3</id>
-							<table>tx_testirremm_offer</table>
+							<table>tx_testirreforeignfield_offer</table>
 						</element>
 					</relations>
 					<softrefs type="array"></softrefs>
 				</rec>
 			</table>
-			<table index="tx_testirremm_offer" type="array">
-				<rec index="3" type="array">
-					<uid>3</uid>
+			<table index="tx_testirreforeignfield_offer" type="array">
+				<rec index="1" type="array">
+					<uid>1</uid>
 					<pid>1</pid>
-					<title>Offer 2.1 (m:n (MM) ASym)</title>
+					<title>Offer 1.1 (nff)</title>
 					<relations index="rels" type="array">
-						<element index="tx_testirremm_price:3" type="array">
-							<id>3</id>
-							<table>tx_testirremm_price</table>
+						<element index="tx_testirreforeignfield_price:1" type="array">
+							<id>1</id>
+							<table>tx_testirreforeignfield_price</table>
+						</element>
+						<element index="tx_testirreforeignfield_price:2" type="array">
+							<id>2</id>
+							<table>tx_testirreforeignfield_price</table>
 						</element>
 					</relations>
 					<softrefs type="array"></softrefs>
 				</rec>
-				<rec index="2" type="array">
-					<uid>2</uid>
+				<rec index="3" type="array">
+					<uid>3</uid>
 					<pid>1</pid>
-					<title>Offer 1.2 (m:n (MM) ASym)</title>
+					<title>Offer 2.1 (nff)</title>
 					<relations index="rels" type="array">
-						<element index="tx_testirremm_price:2" type="array">
-							<id>2</id>
-							<table>tx_testirremm_price</table>
+						<element index="tx_testirreforeignfield_price:4" type="array">
+							<id>4</id>
+							<table>tx_testirreforeignfield_price</table>
 						</element>
 					</relations>
 					<softrefs type="array"></softrefs>
 				</rec>
-				<rec index="1" type="array">
-					<uid>1</uid>
+				<rec index="2" type="array">
+					<uid>2</uid>
 					<pid>1</pid>
-					<title>Offer 1.1 (m:n (MM) ASym)</title>
+					<title>Offer 1.2 (nff)</title>
 					<relations index="rels" type="array">
-						<element index="tx_testirremm_price:1" type="array">
-							<id>1</id>
-							<table>tx_testirremm_price</table>
+						<element index="tx_testirreforeignfield_price:3" type="array">
+							<id>3</id>
+							<table>tx_testirreforeignfield_price</table>
 						</element>
 					</relations>
 					<softrefs type="array"></softrefs>
 				</rec>
 			</table>
-			<table index="tx_testirremm_price" type="array">
-				<rec index="3" type="array">
-					<uid>3</uid>
+			<table index="tx_testirreforeignfield_price" type="array">
+				<rec index="1" type="array">
+					<uid>1</uid>
 					<pid>1</pid>
-					<title>Price (m:n (MM) ASym)</title>
+					<title>Price 1.1.1 (nff)</title>
 					<relations index="rels" type="array"></relations>
 					<softrefs type="array"></softrefs>
 				</rec>
-				<rec index="2" type="array">
-					<uid>2</uid>
+				<rec index="3" type="array">
+					<uid>3</uid>
 					<pid>1</pid>
-					<title>Price 1.2.2 (m:n (MM) ASym)</title>
+					<title>Price 1.2.1 (nff)</title>
 					<relations index="rels" type="array"></relations>
 					<softrefs type="array"></softrefs>
 				</rec>
-				<rec index="1" type="array">
-					<uid>1</uid>
+				<rec index="4" type="array">
+					<uid>4</uid>
 					<pid>1</pid>
-					<title>Price 1.1.1 (m:n (MM) ASym)</title>
+					<title>Price 2.1.1 (nff)</title>
 					<relations index="rels" type="array"></relations>
 					<softrefs type="array"></softrefs>
 				</rec>
-			</table>
-			<table index="tx_testirremnsymmetric_hotel" type="array">
 				<rec index="2" type="array">
 					<uid>2</uid>
 					<pid>1</pid>
-					<title>Hotel Branch 1.1 (mm sym)</title>
-					<relations index="rels" type="array">
-						<element index="tx_testirremnsymmetric_hotel_rel:1" type="array">
-							<id>1</id>
-							<table>tx_testirremnsymmetric_hotel_rel</table>
-						</element>
-					</relations>
-					<softrefs type="array"></softrefs>
-				</rec>
-				<rec index="3" type="array">
-					<uid>3</uid>
-					<pid>1</pid>
-					<title>Hotel branch 1.2 (mm sym)</title>
-					<relations index="rels" type="array">
-						<element index="tx_testirremnsymmetric_hotel_rel:2" type="array">
-							<id>2</id>
-							<table>tx_testirremnsymmetric_hotel_rel</table>
-						</element>
-					</relations>
-					<softrefs type="array"></softrefs>
-				</rec>
-				<rec index="1" type="array">
-					<uid>1</uid>
-					<pid>1</pid>
-					<title>Hotel 1 (mm sym)</title>
-					<relations index="rels" type="array">
-						<element index="tx_testirremnsymmetric_hotel_rel:1" type="array">
-							<id>1</id>
-							<table>tx_testirremnsymmetric_hotel_rel</table>
-						</element>
-						<element index="tx_testirremnsymmetric_hotel_rel:2" type="array">
-							<id>2</id>
-							<table>tx_testirremnsymmetric_hotel_rel</table>
-						</element>
-					</relations>
+					<title>Price 1.1.2 (nff)</title>
+					<relations index="rels" type="array"></relations>
 					<softrefs type="array"></softrefs>
 				</rec>
 			</table>
-			<table index="tx_testirremnsymmetric_hotel_rel" type="array">
+			<table index="tx_testirremm_hotel" type="array">
 				<rec index="1" type="array">
 					<uid>1</uid>
 					<pid>1</pid>
-					<title>1</title>
+					<title>Hotel 1 (m:n (MM) ASym)</title>
 					<relations index="rels" type="array">
-						<element index="tx_testirremnsymmetric_hotel:1" type="array">
+						<element index="tx_testirremm_offer:1" type="array">
 							<id>1</id>
-							<table>tx_testirremnsymmetric_hotel</table>
+							<table>tx_testirremm_offer</table>
 						</element>
-						<element index="tx_testirremnsymmetric_hotel:2" type="array">
+						<element index="tx_testirremm_offer:2" type="array">
 							<id>2</id>
-							<table>tx_testirremnsymmetric_hotel</table>
+							<table>tx_testirremm_offer</table>
 						</element>
 					</relations>
 					<softrefs type="array"></softrefs>
@@ -293,33 +262,25 @@
 				<rec index="2" type="array">
 					<uid>2</uid>
 					<pid>1</pid>
-					<title>2</title>
+					<title>Hotel 2 (m:n (MM) ASym)</title>
 					<relations index="rels" type="array">
-						<element index="tx_testirremnsymmetric_hotel:1" type="array">
-							<id>1</id>
-							<table>tx_testirremnsymmetric_hotel</table>
-						</element>
-						<element index="tx_testirremnsymmetric_hotel:3" type="array">
+						<element index="tx_testirremm_offer:3" type="array">
 							<id>3</id>
-							<table>tx_testirremnsymmetric_hotel</table>
+							<table>tx_testirremm_offer</table>
 						</element>
 					</relations>
 					<softrefs type="array"></softrefs>
 				</rec>
 			</table>
-			<table index="tx_testirreforeignfield_hotel" type="array">
-				<rec index="1" type="array">
-					<uid>1</uid>
+			<table index="tx_testirremm_offer" type="array">
+				<rec index="3" type="array">
+					<uid>3</uid>
 					<pid>1</pid>
-					<title>Hotel 1 (nff)</title>
+					<title>Offer 2.1 (m:n (MM) ASym)</title>
 					<relations index="rels" type="array">
-						<element index="tx_testirreforeignfield_offer:1" type="array">
-							<id>1</id>
-							<table>tx_testirreforeignfield_offer</table>
-						</element>
-						<element index="tx_testirreforeignfield_offer:2" type="array">
-							<id>2</id>
-							<table>tx_testirreforeignfield_offer</table>
+						<element index="tx_testirremm_price:3" type="array">
+							<id>3</id>
+							<table>tx_testirremm_price</table>
 						</element>
 					</relations>
 					<softrefs type="array"></softrefs>
@@ -327,84 +288,47 @@
 				<rec index="2" type="array">
 					<uid>2</uid>
 					<pid>1</pid>
-					<title>Hotel 2 (nff)</title>
+					<title>Offer 1.2 (m:n (MM) ASym)</title>
 					<relations index="rels" type="array">
-						<element index="tx_testirreforeignfield_offer:3" type="array">
-							<id>3</id>
-							<table>tx_testirreforeignfield_offer</table>
+						<element index="tx_testirremm_price:2" type="array">
+							<id>2</id>
+							<table>tx_testirremm_price</table>
 						</element>
 					</relations>
 					<softrefs type="array"></softrefs>
 				</rec>
-			</table>
-			<table index="tx_testirreforeignfield_offer" type="array">
 				<rec index="1" type="array">
 					<uid>1</uid>
 					<pid>1</pid>
-					<title>Offer 1.1 (nff)</title>
+					<title>Offer 1.1 (m:n (MM) ASym)</title>
 					<relations index="rels" type="array">
-						<element index="tx_testirreforeignfield_price:1" type="array">
+						<element index="tx_testirremm_price:1" type="array">
 							<id>1</id>
-							<table>tx_testirreforeignfield_price</table>
-						</element>
-						<element index="tx_testirreforeignfield_price:2" type="array">
-							<id>2</id>
-							<table>tx_testirreforeignfield_price</table>
+							<table>tx_testirremm_price</table>
 						</element>
 					</relations>
 					<softrefs type="array"></softrefs>
 				</rec>
+			</table>
+			<table index="tx_testirremm_price" type="array">
 				<rec index="3" type="array">
 					<uid>3</uid>
 					<pid>1</pid>
-					<title>Offer 2.1 (nff)</title>
-					<relations index="rels" type="array">
-						<element index="tx_testirreforeignfield_price:4" type="array">
-							<id>4</id>
-							<table>tx_testirreforeignfield_price</table>
-						</element>
-					</relations>
+					<title>Price (m:n (MM) ASym)</title>
+					<relations index="rels" type="array"></relations>
 					<softrefs type="array"></softrefs>
 				</rec>
 				<rec index="2" type="array">
 					<uid>2</uid>
 					<pid>1</pid>
-					<title>Offer 1.2 (nff)</title>
-					<relations index="rels" type="array">
-						<element index="tx_testirreforeignfield_price:3" type="array">
-							<id>3</id>
-							<table>tx_testirreforeignfield_price</table>
-						</element>
-					</relations>
+					<title>Price 1.2.2 (m:n (MM) ASym)</title>
+					<relations index="rels" type="array"></relations>
 					<softrefs type="array"></softrefs>
 				</rec>
-			</table>
-			<table index="tx_testirreforeignfield_price" type="array">
 				<rec index="1" type="array">
 					<uid>1</uid>
 					<pid>1</pid>
-					<title>Price 1.1.1 (nff)</title>
-					<relations index="rels" type="array"></relations>
-					<softrefs type="array"></softrefs>
-				</rec>
-				<rec index="3" type="array">
-					<uid>3</uid>
-					<pid>1</pid>
-					<title>Price 1.2.1 (nff)</title>
-					<relations index="rels" type="array"></relations>
-					<softrefs type="array"></softrefs>
-				</rec>
-				<rec index="4" type="array">
-					<uid>4</uid>
-					<pid>1</pid>
-					<title>Price 2.1.1 (nff)</title>
-					<relations index="rels" type="array"></relations>
-					<softrefs type="array"></softrefs>
-				</rec>
-				<rec index="2" type="array">
-					<uid>2</uid>
-					<pid>1</pid>
-					<title>Price 1.1.2 (nff)</title>
+					<title>Price 1.1.1 (m:n (MM) ASym)</title>
 					<relations index="rels" type="array"></relations>
 					<softrefs type="array"></softrefs>
 				</rec>
@@ -597,53 +521,106 @@
 					<softrefs type="array"></softrefs>
 				</rec>
 			</table>
-		</records>
-		<pid_lookup type="array">
-			<page_contents index="0" type="array">
-				<table index="pages" type="array">
-					<item index="1">1</item>
-				</table>
-			</page_contents>
-			<page_contents index="1" type="array">
-				<table index="tt_content" type="array">
-					<item index="1">1</item>
-				</table>
-				<table index="tx_testirrecsv_hotel" type="array">
-					<item index="2">1</item>
-					<item index="1">1</item>
-				</table>
-				<table index="tx_testirrecsv_offer" type="array">
-					<item index="3">1</item>
-					<item index="2">1</item>
-					<item index="1">1</item>
-				</table>
-				<table index="tx_testirrecsv_price" type="array">
-					<item index="3">1</item>
-					<item index="2">1</item>
-					<item index="1">1</item>
-				</table>
-				<table index="tx_testirremm_hotel" type="array">
-					<item index="1">1</item>
-					<item index="2">1</item>
-				</table>
-				<table index="tx_testirremm_offer" type="array">
-					<item index="3">1</item>
-					<item index="2">1</item>
+			<table index="tx_testirremnsymmetric_hotel" type="array">
+				<rec index="2" type="array">
+					<uid>2</uid>
+					<pid>1</pid>
+					<title>Hotel Branch 1.1 (mm sym)</title>
+					<relations index="rels" type="array">
+						<element index="tx_testirremnsymmetric_hotel_rel:1" type="array">
+							<id>1</id>
+							<table>tx_testirremnsymmetric_hotel_rel</table>
+						</element>
+					</relations>
+					<softrefs type="array"></softrefs>
+				</rec>
+				<rec index="3" type="array">
+					<uid>3</uid>
+					<pid>1</pid>
+					<title>Hotel branch 1.2 (mm sym)</title>
+					<relations index="rels" type="array">
+						<element index="tx_testirremnsymmetric_hotel_rel:2" type="array">
+							<id>2</id>
+							<table>tx_testirremnsymmetric_hotel_rel</table>
+						</element>
+					</relations>
+					<softrefs type="array"></softrefs>
+				</rec>
+				<rec index="1" type="array">
+					<uid>1</uid>
+					<pid>1</pid>
+					<title>Hotel 1 (mm sym)</title>
+					<relations index="rels" type="array">
+						<element index="tx_testirremnsymmetric_hotel_rel:1" type="array">
+							<id>1</id>
+							<table>tx_testirremnsymmetric_hotel_rel</table>
+						</element>
+						<element index="tx_testirremnsymmetric_hotel_rel:2" type="array">
+							<id>2</id>
+							<table>tx_testirremnsymmetric_hotel_rel</table>
+						</element>
+					</relations>
+					<softrefs type="array"></softrefs>
+				</rec>
+			</table>
+			<table index="tx_testirremnsymmetric_hotel_rel" type="array">
+				<rec index="1" type="array">
+					<uid>1</uid>
+					<pid>1</pid>
+					<title>1</title>
+					<relations index="rels" type="array">
+						<element index="tx_testirremnsymmetric_hotel:1" type="array">
+							<id>1</id>
+							<table>tx_testirremnsymmetric_hotel</table>
+						</element>
+						<element index="tx_testirremnsymmetric_hotel:2" type="array">
+							<id>2</id>
+							<table>tx_testirremnsymmetric_hotel</table>
+						</element>
+					</relations>
+					<softrefs type="array"></softrefs>
+				</rec>
+				<rec index="2" type="array">
+					<uid>2</uid>
+					<pid>1</pid>
+					<title>2</title>
+					<relations index="rels" type="array">
+						<element index="tx_testirremnsymmetric_hotel:1" type="array">
+							<id>1</id>
+							<table>tx_testirremnsymmetric_hotel</table>
+						</element>
+						<element index="tx_testirremnsymmetric_hotel:3" type="array">
+							<id>3</id>
+							<table>tx_testirremnsymmetric_hotel</table>
+						</element>
+					</relations>
+					<softrefs type="array"></softrefs>
+				</rec>
+			</table>
+		</records>
+		<pid_lookup type="array">
+			<page_contents index="0" type="array">
+				<table index="pages" type="array">
 					<item index="1">1</item>
 				</table>
-				<table index="tx_testirremm_price" type="array">
-					<item index="3">1</item>
-					<item index="2">1</item>
+			</page_contents>
+			<page_contents index="1" type="array">
+				<table index="tt_content" type="array">
 					<item index="1">1</item>
 				</table>
-				<table index="tx_testirremnsymmetric_hotel" type="array">
+				<table index="tx_testirrecsv_hotel" type="array">
 					<item index="2">1</item>
-					<item index="3">1</item>
 					<item index="1">1</item>
 				</table>
-				<table index="tx_testirremnsymmetric_hotel_rel" type="array">
+				<table index="tx_testirrecsv_offer" type="array">
+					<item index="3">1</item>
+					<item index="2">1</item>
 					<item index="1">1</item>
+				</table>
+				<table index="tx_testirrecsv_price" type="array">
+					<item index="3">1</item>
 					<item index="2">1</item>
+					<item index="1">1</item>
 				</table>
 				<table index="tx_testirreforeignfield_hotel" type="array">
 					<item index="1">1</item>
@@ -660,6 +637,20 @@
 					<item index="4">1</item>
 					<item index="2">1</item>
 				</table>
+				<table index="tx_testirremm_hotel" type="array">
+					<item index="1">1</item>
+					<item index="2">1</item>
+				</table>
+				<table index="tx_testirremm_offer" type="array">
+					<item index="3">1</item>
+					<item index="2">1</item>
+					<item index="1">1</item>
+				</table>
+				<table index="tx_testirremm_price" type="array">
+					<item index="3">1</item>
+					<item index="2">1</item>
+					<item index="1">1</item>
+				</table>
 				<table index="tx_testirremnattributeinline_hotel" type="array">
 					<item index="1">1</item>
 				</table>
@@ -687,6 +678,15 @@
 					<item index="1">1</item>
 					<item index="2">1</item>
 				</table>
+				<table index="tx_testirremnsymmetric_hotel" type="array">
+					<item index="2">1</item>
+					<item index="3">1</item>
+					<item index="1">1</item>
+				</table>
+				<table index="tx_testirremnsymmetric_hotel_rel" type="array">
+					<item index="1">1</item>
+					<item index="2">1</item>
+				</table>
 			</page_contents>
 		</pid_lookup>
 	</header>
@@ -910,16 +910,19 @@
 			</fieldlist>
 			<related index="rels" type="array"></related>
 		</tablerow>
-		<tablerow index="tx_testirremm_hotel:1" type="array">
+		<tablerow index="tx_testirreforeignfield_hotel:1" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">1</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">128</field>
+				<field index="sorting" type="integer">1</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="title">Hotel 1 (m:n (MM) ASym)</field>
+				<field index="parentid" type="integer">1</field>
+				<field index="parenttable">tt_content</field>
+				<field index="parentidentifier">1nff.hotels</field>
+				<field index="title">Hotel 1 (nff)</field>
 				<field index="offers" type="integer">2</field>
 			</fieldlist>
 			<related index="rels" type="array">
@@ -928,26 +931,29 @@
 					<relations index="itemArray" type="array">
 						<element index="0" type="array">
 							<id>1</id>
-							<table>tx_testirremm_offer</table>
+							<table>tx_testirreforeignfield_offer</table>
 						</element>
 						<element index="1" type="array">
 							<id>2</id>
-							<table>tx_testirremm_offer</table>
+							<table>tx_testirreforeignfield_offer</table>
 						</element>
 					</relations>
 				</field>
 			</related>
 		</tablerow>
-		<tablerow index="tx_testirremm_hotel:2" type="array">
+		<tablerow index="tx_testirreforeignfield_hotel:2" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">2</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">256</field>
+				<field index="sorting" type="integer">2</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="title">Hotel 2 (m:n (MM) ASym)</field>
+				<field index="parentid" type="integer">1</field>
+				<field index="parenttable">tt_content</field>
+				<field index="parentidentifier">1nff.hotels</field>
+				<field index="title">Hotel 2 (nff)</field>
 				<field index="offers" type="integer">1</field>
 			</fieldlist>
 			<related index="rels" type="array">
@@ -956,48 +962,56 @@
 					<relations index="itemArray" type="array">
 						<element index="0" type="array">
 							<id>3</id>
-							<table>tx_testirremm_offer</table>
+							<table>tx_testirreforeignfield_offer</table>
 						</element>
 					</relations>
 				</field>
 			</related>
 		</tablerow>
-		<tablerow index="tx_testirremm_offer:3" type="array">
+		<tablerow index="tx_testirreforeignfield_offer:1" type="array">
 			<fieldlist index="data" type="array">
-				<field index="uid" type="integer">3</field>
+				<field index="uid" type="integer">1</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">64</field>
+				<field index="sorting" type="integer">1</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="title">Offer 2.1 (m:n (MM) ASym)</field>
-				<field index="hotels" type="integer">0</field>
-				<field index="prices" type="integer">1</field>
+				<field index="parentid" type="integer">1</field>
+				<field index="parenttable">tx_testirreforeignfield_hotel</field>
+				<field index="parentidentifier"></field>
+				<field index="title">Offer 1.1 (nff)</field>
+				<field index="prices" type="integer">2</field>
 			</fieldlist>
 			<related index="rels" type="array">
 				<field index="prices" type="array">
 					<type>db</type>
 					<relations index="itemArray" type="array">
 						<element index="0" type="array">
-							<id>3</id>
-							<table>tx_testirremm_price</table>
+							<id>1</id>
+							<table>tx_testirreforeignfield_price</table>
+						</element>
+						<element index="1" type="array">
+							<id>2</id>
+							<table>tx_testirreforeignfield_price</table>
 						</element>
 					</relations>
 				</field>
 			</related>
 		</tablerow>
-		<tablerow index="tx_testirremm_offer:2" type="array">
+		<tablerow index="tx_testirreforeignfield_offer:3" type="array">
 			<fieldlist index="data" type="array">
-				<field index="uid" type="integer">2</field>
+				<field index="uid" type="integer">3</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">128</field>
+				<field index="sorting" type="integer">1</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="title">Offer 1.2 (m:n (MM) ASym)</field>
-				<field index="hotels" type="integer">0</field>
+				<field index="parentid" type="integer">2</field>
+				<field index="parenttable">tx_testirreforeignfield_hotel</field>
+				<field index="parentidentifier"></field>
+				<field index="title">Offer 2.1 (nff)</field>
 				<field index="prices" type="integer">1</field>
 			</fieldlist>
 			<related index="rels" type="array">
@@ -1005,24 +1019,26 @@
 					<type>db</type>
 					<relations index="itemArray" type="array">
 						<element index="0" type="array">
-							<id>2</id>
-							<table>tx_testirremm_price</table>
+							<id>4</id>
+							<table>tx_testirreforeignfield_price</table>
 						</element>
 					</relations>
 				</field>
 			</related>
 		</tablerow>
-		<tablerow index="tx_testirremm_offer:1" type="array">
+		<tablerow index="tx_testirreforeignfield_offer:2" type="array">
 			<fieldlist index="data" type="array">
-				<field index="uid" type="integer">1</field>
+				<field index="uid" type="integer">2</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">256</field>
+				<field index="sorting" type="integer">2</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="title">Offer 1.1 (m:n (MM) ASym)</field>
-				<field index="hotels" type="integer">0</field>
+				<field index="parentid" type="integer">1</field>
+				<field index="parenttable">tx_testirreforeignfield_hotel</field>
+				<field index="parentidentifier"></field>
+				<field index="title">Offer 1.2 (nff)</field>
 				<field index="prices" type="integer">1</field>
 			</fieldlist>
 			<related index="rels" type="array">
@@ -1030,215 +1046,91 @@
 					<type>db</type>
 					<relations index="itemArray" type="array">
 						<element index="0" type="array">
-							<id>1</id>
-							<table>tx_testirremm_price</table>
+							<id>3</id>
+							<table>tx_testirreforeignfield_price</table>
 						</element>
 					</relations>
 				</field>
 			</related>
 		</tablerow>
-		<tablerow index="tx_testirremm_price:3" type="array">
-			<fieldlist index="data" type="array">
-				<field index="uid" type="integer">3</field>
-				<field index="pid" type="integer">1</field>
-				<field index="deleted" type="integer">0</field>
-				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">64</field>
-				<field index="sys_language_uid" type="integer">0</field>
-				<field index="l18n_parent" type="integer">0</field>
-				<field index="title">Price (m:n (MM) ASym)</field>
-				<field index="price">223.00</field>
-				<field index="offers" type="integer">0</field>
-			</fieldlist>
-			<related index="rels" type="array"></related>
-		</tablerow>
-		<tablerow index="tx_testirremm_price:2" type="array">
-			<fieldlist index="data" type="array">
-				<field index="uid" type="integer">2</field>
-				<field index="pid" type="integer">1</field>
-				<field index="deleted" type="integer">0</field>
-				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">128</field>
-				<field index="sys_language_uid" type="integer">0</field>
-				<field index="l18n_parent" type="integer">0</field>
-				<field index="title">Price 1.2.2 (m:n (MM) ASym)</field>
-				<field index="price">567.00</field>
-				<field index="offers" type="integer">0</field>
-			</fieldlist>
-			<related index="rels" type="array"></related>
-		</tablerow>
-		<tablerow index="tx_testirremm_price:1" type="array">
+		<tablerow index="tx_testirreforeignfield_price:1" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">1</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">256</field>
+				<field index="sorting" type="integer">1</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="title">Price 1.1.1 (m:n (MM) ASym)</field>
-				<field index="price">567.00</field>
-				<field index="offers" type="integer">0</field>
+				<field index="parentid" type="integer">1</field>
+				<field index="parenttable">tx_testirreforeignfield_offer</field>
+				<field index="parentidentifier"></field>
+				<field index="title">Price 1.1.1 (nff)</field>
+				<field index="price">4.00</field>
 			</fieldlist>
 			<related index="rels" type="array"></related>
 		</tablerow>
-		<tablerow index="tx_testirremnsymmetric_hotel:2" type="array">
-			<fieldlist index="data" type="array">
-				<field index="uid" type="integer">2</field>
-				<field index="pid" type="integer">1</field>
-				<field index="deleted" type="integer">0</field>
-				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">64</field>
-				<field index="sys_language_uid" type="integer">0</field>
-				<field index="l18n_parent" type="integer">0</field>
-				<field index="title">Hotel Branch 1.1 (mm sym)</field>
-				<field index="branches" type="integer">1</field>
-			</fieldlist>
-			<related index="rels" type="array">
-				<field index="branches" type="array">
-					<type>db</type>
-					<relations index="itemArray" type="array">
-						<element index="0" type="array">
-							<id>1</id>
-							<table>tx_testirremnsymmetric_hotel_rel</table>
-						</element>
-					</relations>
-				</field>
-			</related>
-		</tablerow>
-		<tablerow index="tx_testirremnsymmetric_hotel:3" type="array">
+		<tablerow index="tx_testirreforeignfield_price:3" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">3</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">128</field>
-				<field index="sys_language_uid" type="integer">0</field>
-				<field index="l18n_parent" type="integer">0</field>
-				<field index="title">Hotel branch 1.2 (mm sym)</field>
-				<field index="branches" type="integer">1</field>
-			</fieldlist>
-			<related index="rels" type="array">
-				<field index="branches" type="array">
-					<type>db</type>
-					<relations index="itemArray" type="array">
-						<element index="0" type="array">
-							<id>2</id>
-							<table>tx_testirremnsymmetric_hotel_rel</table>
-						</element>
-					</relations>
-				</field>
-			</related>
-		</tablerow>
-		<tablerow index="tx_testirremnsymmetric_hotel:1" type="array">
-			<fieldlist index="data" type="array">
-				<field index="uid" type="integer">1</field>
-				<field index="pid" type="integer">1</field>
-				<field index="deleted" type="integer">0</field>
-				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">256</field>
+				<field index="sorting" type="integer">1</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="title">Hotel 1 (mm sym)</field>
-				<field index="branches" type="integer">2</field>
+				<field index="parentid" type="integer">2</field>
+				<field index="parenttable">tx_testirreforeignfield_offer</field>
+				<field index="parentidentifier"></field>
+				<field index="title">Price 1.2.1 (nff)</field>
+				<field index="price">678.00</field>
 			</fieldlist>
-			<related index="rels" type="array">
-				<field index="branches" type="array">
-					<type>db</type>
-					<relations index="itemArray" type="array">
-						<element index="0" type="array">
-							<id>1</id>
-							<table>tx_testirremnsymmetric_hotel_rel</table>
-						</element>
-						<element index="1" type="array">
-							<id>2</id>
-							<table>tx_testirremnsymmetric_hotel_rel</table>
-						</element>
-					</relations>
-				</field>
-			</related>
+			<related index="rels" type="array"></related>
 		</tablerow>
-		<tablerow index="tx_testirremnsymmetric_hotel_rel:1" type="array">
+		<tablerow index="tx_testirreforeignfield_price:4" type="array">
 			<fieldlist index="data" type="array">
-				<field index="uid" type="integer">1</field>
+				<field index="uid" type="integer">4</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
+				<field index="sorting" type="integer">1</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="hotelid" type="integer">1</field>
-				<field index="branchid" type="integer">2</field>
-				<field index="hotelsort" type="integer">1</field>
-				<field index="branchsort" type="integer">1</field>
+				<field index="parentid" type="integer">3</field>
+				<field index="parenttable">tx_testirreforeignfield_offer</field>
+				<field index="parentidentifier"></field>
+				<field index="title">Price 2.1.1 (nff)</field>
+				<field index="price">5467567.00</field>
 			</fieldlist>
-			<related index="rels" type="array">
-				<field index="hotelid" type="array">
-					<type>db</type>
-					<relations index="itemArray" type="array">
-						<element index="0" type="array">
-							<id>1</id>
-							<table>tx_testirremnsymmetric_hotel</table>
-						</element>
-					</relations>
-				</field>
-				<field index="branchid" type="array">
-					<type>db</type>
-					<relations index="itemArray" type="array">
-						<element index="0" type="array">
-							<id>2</id>
-							<table>tx_testirremnsymmetric_hotel</table>
-						</element>
-					</relations>
-				</field>
-			</related>
+			<related index="rels" type="array"></related>
 		</tablerow>
-		<tablerow index="tx_testirremnsymmetric_hotel_rel:2" type="array">
+		<tablerow index="tx_testirreforeignfield_price:2" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">2</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
+				<field index="sorting" type="integer">2</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="hotelid" type="integer">1</field>
-				<field index="branchid" type="integer">3</field>
-				<field index="hotelsort" type="integer">2</field>
-				<field index="branchsort" type="integer">0</field>
+				<field index="parentid" type="integer">1</field>
+				<field index="parenttable">tx_testirreforeignfield_offer</field>
+				<field index="parentidentifier"></field>
+				<field index="title">Price 1.1.2 (nff)</field>
+				<field index="price">869.00</field>
 			</fieldlist>
-			<related index="rels" type="array">
-				<field index="hotelid" type="array">
-					<type>db</type>
-					<relations index="itemArray" type="array">
-						<element index="0" type="array">
-							<id>1</id>
-							<table>tx_testirremnsymmetric_hotel</table>
-						</element>
-					</relations>
-				</field>
-				<field index="branchid" type="array">
-					<type>db</type>
-					<relations index="itemArray" type="array">
-						<element index="0" type="array">
-							<id>3</id>
-							<table>tx_testirremnsymmetric_hotel</table>
-						</element>
-					</relations>
-				</field>
-			</related>
+			<related index="rels" type="array"></related>
 		</tablerow>
-		<tablerow index="tx_testirreforeignfield_hotel:1" type="array">
+		<tablerow index="tx_testirremm_hotel:1" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">1</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">1</field>
+				<field index="sorting" type="integer">128</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="parentid" type="integer">1</field>
-				<field index="parenttable">tt_content</field>
-				<field index="parentidentifier">1nff.hotels</field>
-				<field index="title">Hotel 1 (nff)</field>
+				<field index="title">Hotel 1 (m:n (MM) ASym)</field>
 				<field index="offers" type="integer">2</field>
 			</fieldlist>
 			<related index="rels" type="array">
@@ -1247,87 +1139,51 @@
 					<relations index="itemArray" type="array">
 						<element index="0" type="array">
 							<id>1</id>
-							<table>tx_testirreforeignfield_offer</table>
+							<table>tx_testirremm_offer</table>
 						</element>
 						<element index="1" type="array">
 							<id>2</id>
-							<table>tx_testirreforeignfield_offer</table>
-						</element>
-					</relations>
-				</field>
-			</related>
-		</tablerow>
-		<tablerow index="tx_testirreforeignfield_hotel:2" type="array">
-			<fieldlist index="data" type="array">
-				<field index="uid" type="integer">2</field>
-				<field index="pid" type="integer">1</field>
-				<field index="deleted" type="integer">0</field>
-				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">2</field>
-				<field index="sys_language_uid" type="integer">0</field>
-				<field index="l18n_parent" type="integer">0</field>
-				<field index="parentid" type="integer">1</field>
-				<field index="parenttable">tt_content</field>
-				<field index="parentidentifier">1nff.hotels</field>
-				<field index="title">Hotel 2 (nff)</field>
-				<field index="offers" type="integer">1</field>
-			</fieldlist>
-			<related index="rels" type="array">
-				<field index="offers" type="array">
-					<type>db</type>
-					<relations index="itemArray" type="array">
-						<element index="0" type="array">
-							<id>3</id>
-							<table>tx_testirreforeignfield_offer</table>
+							<table>tx_testirremm_offer</table>
 						</element>
 					</relations>
 				</field>
 			</related>
 		</tablerow>
-		<tablerow index="tx_testirreforeignfield_offer:1" type="array">
+		<tablerow index="tx_testirremm_hotel:2" type="array">
 			<fieldlist index="data" type="array">
-				<field index="uid" type="integer">1</field>
+				<field index="uid" type="integer">2</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">1</field>
+				<field index="sorting" type="integer">256</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="parentid" type="integer">1</field>
-				<field index="parenttable">tx_testirreforeignfield_hotel</field>
-				<field index="parentidentifier"></field>
-				<field index="title">Offer 1.1 (nff)</field>
-				<field index="prices" type="integer">2</field>
+				<field index="title">Hotel 2 (m:n (MM) ASym)</field>
+				<field index="offers" type="integer">1</field>
 			</fieldlist>
 			<related index="rels" type="array">
-				<field index="prices" type="array">
+				<field index="offers" type="array">
 					<type>db</type>
 					<relations index="itemArray" type="array">
 						<element index="0" type="array">
-							<id>1</id>
-							<table>tx_testirreforeignfield_price</table>
-						</element>
-						<element index="1" type="array">
-							<id>2</id>
-							<table>tx_testirreforeignfield_price</table>
+							<id>3</id>
+							<table>tx_testirremm_offer</table>
 						</element>
 					</relations>
 				</field>
 			</related>
 		</tablerow>
-		<tablerow index="tx_testirreforeignfield_offer:3" type="array">
+		<tablerow index="tx_testirremm_offer:3" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">3</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">1</field>
+				<field index="sorting" type="integer">64</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="parentid" type="integer">2</field>
-				<field index="parenttable">tx_testirreforeignfield_hotel</field>
-				<field index="parentidentifier"></field>
-				<field index="title">Offer 2.1 (nff)</field>
+				<field index="title">Offer 2.1 (m:n (MM) ASym)</field>
+				<field index="hotels" type="integer">0</field>
 				<field index="prices" type="integer">1</field>
 			</fieldlist>
 			<related index="rels" type="array">
@@ -1335,26 +1191,24 @@
 					<type>db</type>
 					<relations index="itemArray" type="array">
 						<element index="0" type="array">
-							<id>4</id>
-							<table>tx_testirreforeignfield_price</table>
+							<id>3</id>
+							<table>tx_testirremm_price</table>
 						</element>
 					</relations>
 				</field>
 			</related>
 		</tablerow>
-		<tablerow index="tx_testirreforeignfield_offer:2" type="array">
+		<tablerow index="tx_testirremm_offer:2" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">2</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">2</field>
+				<field index="sorting" type="integer">128</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="parentid" type="integer">1</field>
-				<field index="parenttable">tx_testirreforeignfield_hotel</field>
-				<field index="parentidentifier"></field>
-				<field index="title">Offer 1.2 (nff)</field>
+				<field index="title">Offer 1.2 (m:n (MM) ASym)</field>
+				<field index="hotels" type="integer">0</field>
 				<field index="prices" type="integer">1</field>
 			</fieldlist>
 			<related index="rels" type="array">
@@ -1362,78 +1216,80 @@
 					<type>db</type>
 					<relations index="itemArray" type="array">
 						<element index="0" type="array">
-							<id>3</id>
-							<table>tx_testirreforeignfield_price</table>
+							<id>2</id>
+							<table>tx_testirremm_price</table>
 						</element>
 					</relations>
 				</field>
 			</related>
 		</tablerow>
-		<tablerow index="tx_testirreforeignfield_price:1" type="array">
+		<tablerow index="tx_testirremm_offer:1" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">1</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">1</field>
+				<field index="sorting" type="integer">256</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="parentid" type="integer">1</field>
-				<field index="parenttable">tx_testirreforeignfield_offer</field>
-				<field index="parentidentifier"></field>
-				<field index="title">Price 1.1.1 (nff)</field>
-				<field index="price">4.00</field>
+				<field index="title">Offer 1.1 (m:n (MM) ASym)</field>
+				<field index="hotels" type="integer">0</field>
+				<field index="prices" type="integer">1</field>
 			</fieldlist>
-			<related index="rels" type="array"></related>
+			<related index="rels" type="array">
+				<field index="prices" type="array">
+					<type>db</type>
+					<relations index="itemArray" type="array">
+						<element index="0" type="array">
+							<id>1</id>
+							<table>tx_testirremm_price</table>
+						</element>
+					</relations>
+				</field>
+			</related>
 		</tablerow>
-		<tablerow index="tx_testirreforeignfield_price:3" type="array">
+		<tablerow index="tx_testirremm_price:3" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">3</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">1</field>
+				<field index="sorting" type="integer">64</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="parentid" type="integer">2</field>
-				<field index="parenttable">tx_testirreforeignfield_offer</field>
-				<field index="parentidentifier"></field>
-				<field index="title">Price 1.2.1 (nff)</field>
-				<field index="price">678.00</field>
+				<field index="title">Price (m:n (MM) ASym)</field>
+				<field index="price">223.00</field>
+				<field index="offers" type="integer">0</field>
 			</fieldlist>
 			<related index="rels" type="array"></related>
 		</tablerow>
-		<tablerow index="tx_testirreforeignfield_price:4" type="array">
+		<tablerow index="tx_testirremm_price:2" type="array">
 			<fieldlist index="data" type="array">
-				<field index="uid" type="integer">4</field>
+				<field index="uid" type="integer">2</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">1</field>
+				<field index="sorting" type="integer">128</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="parentid" type="integer">3</field>
-				<field index="parenttable">tx_testirreforeignfield_offer</field>
-				<field index="parentidentifier"></field>
-				<field index="title">Price 2.1.1 (nff)</field>
-				<field index="price">5467567.00</field>
+				<field index="title">Price 1.2.2 (m:n (MM) ASym)</field>
+				<field index="price">567.00</field>
+				<field index="offers" type="integer">0</field>
 			</fieldlist>
 			<related index="rels" type="array"></related>
 		</tablerow>
-		<tablerow index="tx_testirreforeignfield_price:2" type="array">
+		<tablerow index="tx_testirremm_price:1" type="array">
 			<fieldlist index="data" type="array">
-				<field index="uid" type="integer">2</field>
+				<field index="uid" type="integer">1</field>
 				<field index="pid" type="integer">1</field>
 				<field index="deleted" type="integer">0</field>
 				<field index="hidden" type="integer">0</field>
-				<field index="sorting" type="integer">2</field>
+				<field index="sorting" type="integer">256</field>
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
-				<field index="parentid" type="integer">1</field>
-				<field index="parenttable">tx_testirreforeignfield_offer</field>
-				<field index="parentidentifier"></field>
-				<field index="title">Price 1.1.2 (nff)</field>
-				<field index="price">869.00</field>
+				<field index="title">Price 1.1.1 (m:n (MM) ASym)</field>
+				<field index="price">567.00</field>
+				<field index="offers" type="integer">0</field>
 			</fieldlist>
 			<related index="rels" type="array"></related>
 		</tablerow>
@@ -1799,5 +1655,149 @@
 				</field>
 			</related>
 		</tablerow>
+		<tablerow index="tx_testirremnsymmetric_hotel:2" type="array">
+			<fieldlist index="data" type="array">
+				<field index="uid" type="integer">2</field>
+				<field index="pid" type="integer">1</field>
+				<field index="deleted" type="integer">0</field>
+				<field index="hidden" type="integer">0</field>
+				<field index="sorting" type="integer">64</field>
+				<field index="sys_language_uid" type="integer">0</field>
+				<field index="l18n_parent" type="integer">0</field>
+				<field index="title">Hotel Branch 1.1 (mm sym)</field>
+				<field index="branches" type="integer">1</field>
+			</fieldlist>
+			<related index="rels" type="array">
+				<field index="branches" type="array">
+					<type>db</type>
+					<relations index="itemArray" type="array">
+						<element index="0" type="array">
+							<id>1</id>
+							<table>tx_testirremnsymmetric_hotel_rel</table>
+						</element>
+					</relations>
+				</field>
+			</related>
+		</tablerow>
+		<tablerow index="tx_testirremnsymmetric_hotel:3" type="array">
+			<fieldlist index="data" type="array">
+				<field index="uid" type="integer">3</field>
+				<field index="pid" type="integer">1</field>
+				<field index="deleted" type="integer">0</field>
+				<field index="hidden" type="integer">0</field>
+				<field index="sorting" type="integer">128</field>
+				<field index="sys_language_uid" type="integer">0</field>
+				<field index="l18n_parent" type="integer">0</field>
+				<field index="title">Hotel branch 1.2 (mm sym)</field>
+				<field index="branches" type="integer">1</field>
+			</fieldlist>
+			<related index="rels" type="array">
+				<field index="branches" type="array">
+					<type>db</type>
+					<relations index="itemArray" type="array">
+						<element index="0" type="array">
+							<id>2</id>
+							<table>tx_testirremnsymmetric_hotel_rel</table>
+						</element>
+					</relations>
+				</field>
+			</related>
+		</tablerow>
+		<tablerow index="tx_testirremnsymmetric_hotel:1" type="array">
+			<fieldlist index="data" type="array">
+				<field index="uid" type="integer">1</field>
+				<field index="pid" type="integer">1</field>
+				<field index="deleted" type="integer">0</field>
+				<field index="hidden" type="integer">0</field>
+				<field index="sorting" type="integer">256</field>
+				<field index="sys_language_uid" type="integer">0</field>
+				<field index="l18n_parent" type="integer">0</field>
+				<field index="title">Hotel 1 (mm sym)</field>
+				<field index="branches" type="integer">2</field>
+			</fieldlist>
+			<related index="rels" type="array">
+				<field index="branches" type="array">
+					<type>db</type>
+					<relations index="itemArray" type="array">
+						<element index="0" type="array">
+							<id>1</id>
+							<table>tx_testirremnsymmetric_hotel_rel</table>
+						</element>
+						<element index="1" type="array">
+							<id>2</id>
+							<table>tx_testirremnsymmetric_hotel_rel</table>
+						</element>
+					</relations>
+				</field>
+			</related>
+		</tablerow>
+		<tablerow index="tx_testirremnsymmetric_hotel_rel:1" type="array">
+			<fieldlist index="data" type="array">
+				<field index="uid" type="integer">1</field>
+				<field index="pid" type="integer">1</field>
+				<field index="deleted" type="integer">0</field>
+				<field index="hidden" type="integer">0</field>
+				<field index="sys_language_uid" type="integer">0</field>
+				<field index="l18n_parent" type="integer">0</field>
+				<field index="hotelid" type="integer">1</field>
+				<field index="branchid" type="integer">2</field>
+				<field index="hotelsort" type="integer">1</field>
+				<field index="branchsort" type="integer">1</field>
+			</fieldlist>
+			<related index="rels" type="array">
+				<field index="hotelid" type="array">
+					<type>db</type>
+					<relations index="itemArray" type="array">
+						<element index="0" type="array">
+							<id>1</id>
+							<table>tx_testirremnsymmetric_hotel</table>
+						</element>
+					</relations>
+				</field>
+				<field index="branchid" type="array">
+					<type>db</type>
+					<relations index="itemArray" type="array">
+						<element index="0" type="array">
+							<id>2</id>
+							<table>tx_testirremnsymmetric_hotel</table>
+						</element>
+					</relations>
+				</field>
+			</related>
+		</tablerow>
+		<tablerow index="tx_testirremnsymmetric_hotel_rel:2" type="array">
+			<fieldlist index="data" type="array">
+				<field index="uid" type="integer">2</field>
+				<field index="pid" type="integer">1</field>
+				<field index="deleted" type="integer">0</field>
+				<field index="hidden" type="integer">0</field>
+				<field index="sys_language_uid" type="integer">0</field>
+				<field index="l18n_parent" type="integer">0</field>
+				<field index="hotelid" type="integer">1</field>
+				<field index="branchid" type="integer">3</field>
+				<field index="hotelsort" type="integer">2</field>
+				<field index="branchsort" type="integer">0</field>
+			</fieldlist>
+			<related index="rels" type="array">
+				<field index="hotelid" type="array">
+					<type>db</type>
+					<relations index="itemArray" type="array">
+						<element index="0" type="array">
+							<id>1</id>
+							<table>tx_testirremnsymmetric_hotel</table>
+						</element>
+					</relations>
+				</field>
+				<field index="branchid" type="array">
+					<type>db</type>
+					<relations index="itemArray" type="array">
+						<element index="0" type="array">
+							<id>3</id>
+							<table>tx_testirremnsymmetric_hotel</table>
+						</element>
+					</relations>
+				</field>
+			</related>
+		</tablerow>
 	</records>
 </T3RecordDocument>
\ No newline at end of file