From f5e48b3e41a14c4edc8c9bd5cb84e2d0047deefe Mon Sep 17 00:00:00 2001
From: Anja Leichsenring <aleichsenring@ab-softlab.de>
Date: Mon, 15 Nov 2021 18:26:00 +0100
Subject: [PATCH] [BUGFIX] Define foreign_match_field definition for test setup

ext:irre_tutorial has two relations to tx_irretutorial_1nff_hotel
from tt_content: One from native field tx_irretutorial_1nff_hotels
and one from within flex for field tx_irretutorial_flexform.

With two relations in place, both need a foreign_match_fields
definition written to the child table to distinguish the two
relations. This is missing for tx_irretutorial_1nff_hotels and
leads to the situation that adding a relation to the flex field
is then shown as relation for the native field, too.

The patch adds a foreign_match_fields definition to the native
field and adapts the .csv test cases accordingly.

Resolves: #95986
Releases: master
Change-Id: I19f36990f1b6a699029b56b4bf62690128a5bb67
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/72181
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Jochen <rothjochen@gmail.com>
Tested-by: core-ci <typo3@b13.com>
Tested-by: Oliver Bartsch <bo@cedev.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Jochen <rothjochen@gmail.com>
Reviewed-by: Oliver Bartsch <bo@cedev.de>
---
 .../DataHandler/DataSet/LiveDefaultElements.csv  |  6 +++---
 .../IRRE/ForeignField/DataSet/ImportDefault.csv  |  6 +++---
 .../DataSet/changeParentContentSorting.csv       |  6 +++---
 .../ForeignField/Modify/DataSet/copyPage.csv     | 12 ++++++------
 .../copyPageWHotelBeforeParentContent.csv        | 12 ++++++------
 .../Modify/DataSet/copyParentContent.csv         |  8 ++++----
 .../DataSet/copyParentContentToDifferentPage.csv |  8 ++++----
 .../copyParentContentToLanguageWAllChildren.csv  |  8 ++++----
 ...ateNCopyParentContentNHotelNOfferChildren.csv | 10 +++++-----
 ...LocalizeParentContentNHotelNOfferChildren.csv | 10 +++++-----
 ...ParentContentNHotelNOfferChildrenWOSortBy.csv | 10 +++++-----
 .../Modify/DataSet/createParentContent.csv       |  6 +++---
 .../createParentContentNHotelNOfferChildren.csv  |  8 ++++----
 .../ForeignField/Modify/DataSet/deletePage.csv   |  6 +++---
 .../Modify/DataSet/deleteParentContent.csv       |  6 +++---
 .../inlineLocalizeSynchronizeLocalizeMissing.csv | 12 ++++++------
 .../localizeNCopyPageWSynchronization.csv        | 12 ++++++------
 ...noglotHotelChildNCopyPageWSynchronization.csv | 12 ++++++------
 .../localizePageNAddHotelChildWExclude.csv       |  6 +++---
 ...ocalizePageNAddHotelChildWSynchronization.csv |  6 +++---
 ...ageNAddMonoglotHotelChildWSynchronization.csv |  6 +++---
 .../Modify/DataSet/localizePageTwiceWExclude.csv |  6 +++---
 .../Modify/DataSet/localizePageWExclude.csv      |  6 +++---
 .../DataSet/localizePageWSynchronization.csv     |  6 +++---
 ...ithSynchronizationAndCustomLocalizedHotel.csv |  6 +++---
 ...ContentChainLanguageSynchronizationSource.csv | 16 ++++++++--------
 ...ateNestedChildrenWLanguageSynchronization.csv | 12 ++++++------
 .../localizeParentContentSynchronization.csv     |  8 ++++----
 .../localizeParentContentWAllChildren.csv        |  8 ++++----
 .../Modify/DataSet/modifyOnlyHotelChild.csv      |  6 +++---
 .../ForeignField/Modify/DataSet/modifyPage.csv   |  6 +++---
 .../Modify/DataSet/modifyParentContent.csv       |  6 +++---
 .../DataSet/modifyParentNAddHotelChild.csv       |  8 ++++----
 .../modifyParentNChangeHotelChildrenSorting.csv  |  6 +++---
 .../DataSet/modifyParentNDeleteHotelChild.csv    |  6 +++---
 .../Modify/DataSet/modifyParentNHotelChild.csv   |  6 +++---
 .../DataSet/moveParentContentToDifferentPage.csv |  6 +++---
 ...arentContentToDifferentPageNChangeSorting.csv |  6 +++---
 .../Configuration/TCA/Overrides/tt_content.php   |  5 +++++
 .../DatabaseAssertions/importIrreRecords.csv     |  4 ++--
 .../Fixtures/DatabaseImports/irre_tutorial.xml   |  4 ++--
 .../Fixtures/XmlExports/irre-records.xml         |  4 ++--
 .../Fixtures/XmlImports/irre-records.xml         |  4 ++--
 .../IRRE/ForeignField/DataSet/ImportDefault.csv  |  6 +++---
 .../DataSet/changeParentContentSorting.csv       |  6 +++---
 .../ForeignField/Discard/DataSet/copyPage.csv    |  6 +++---
 .../copyPageWHotelBeforeParentContent.csv        |  6 +++---
 .../Discard/DataSet/copyParentContent.csv        |  6 +++---
 .../DataSet/copyParentContentToDifferentPage.csv |  6 +++---
 ...ateNCopyParentContentNHotelNOfferChildren.csv |  8 ++++----
 ...rentNHotelNOfferChildrenNDiscardLocParent.csv |  8 ++++----
 ...LocalizeParentContentNHotelNOfferChildren.csv |  6 +++---
 .../Discard/DataSet/createParentContent.csv      |  6 +++---
 .../createParentContentNHotelNOfferChildren.csv  |  6 +++---
 .../ForeignField/Discard/DataSet/deletePage.csv  |  6 +++---
 .../Discard/DataSet/deleteParentContent.csv      |  6 +++---
 .../localizeParentContentWAllChildren.csv        |  6 +++---
 .../modifyNDiscardNModifyParentWHotelChild.csv   |  6 +++---
 .../Discard/DataSet/modifyOnlyHotelChild.csv     |  6 +++---
 .../ForeignField/Discard/DataSet/modifyPage.csv  |  6 +++---
 .../Discard/DataSet/modifyParentContent.csv      |  6 +++---
 .../DataSet/modifyParentNAddHotelChild.csv       |  6 +++---
 .../modifyParentNChangeHotelChildrenSorting.csv  |  6 +++---
 .../DataSet/modifyParentNDeleteHotelChild.csv    |  6 +++---
 .../Discard/DataSet/modifyParentNHotelChild.csv  |  6 +++---
 .../DataSet/moveParentContentToDifferentPage.csv |  6 +++---
 ...arentContentToDifferentPageNChangeSorting.csv |  6 +++---
 .../moveParentContentToDifferentPageTwice.csv    |  6 +++---
 ...ngeHotelSortingWithOfferNotWorkspaceAware.csv |  8 ++++----
 .../DataSet/changeParentContentSorting.csv       | 10 +++++-----
 .../ForeignField/Modify/DataSet/copyPage.csv     | 12 ++++++------
 .../copyPageWHotelBeforeParentContent.csv        | 12 ++++++------
 .../Modify/DataSet/copyParentContent.csv         |  8 ++++----
 .../DataSet/copyParentContentToDifferentPage.csv |  8 ++++----
 ...ateNCopyParentContentNHotelNOfferChildren.csv | 10 +++++-----
 ...LocalizeParentContentNHotelNOfferChildren.csv | 10 +++++-----
 ...ParentContentNHotelNOfferChildrenWOSortBy.csv | 10 +++++-----
 .../Modify/DataSet/createParentContent.csv       |  6 +++---
 .../createParentContentNHotelNOfferChildren.csv  |  8 ++++----
 .../ForeignField/Modify/DataSet/deletePage.csv   |  6 +++---
 .../Modify/DataSet/deleteParentContent.csv       |  8 ++++----
 .../inlineLocalizeSynchronizeLocalizeMissing.csv | 10 +++++-----
 .../localizeParentContentWAllChildren.csv        |  8 ++++----
 .../modifyNDiscardNModifyParentWHotelChild.csv   | 10 +++++-----
 .../Modify/DataSet/modifyOnlyHotelChild.csv      |  8 ++++----
 .../ForeignField/Modify/DataSet/modifyPage.csv   |  6 +++---
 .../Modify/DataSet/modifyParentContent.csv       |  8 ++++----
 .../DataSet/modifyParentNAddHotelChild.csv       | 10 +++++-----
 .../modifyParentNChangeHotelChildrenSorting.csv  | 10 +++++-----
 .../DataSet/modifyParentNDeleteHotelChild.csv    | 10 +++++-----
 .../Modify/DataSet/modifyParentNHotelChild.csv   | 10 +++++-----
 .../DataSet/moveParentContentToDifferentPage.csv |  8 ++++----
 ...arentContentToDifferentPageNChangeSorting.csv | 12 ++++++------
 .../moveParentContentToDifferentPageTwice.csv    |  8 ++++----
 .../DataSet/changeParentContentSorting.csv       |  6 +++---
 .../ForeignField/Publish/DataSet/copyPage.csv    | 12 ++++++------
 .../copyPageWHotelBeforeParentContent.csv        | 12 ++++++------
 .../Publish/DataSet/copyParentContent.csv        |  8 ++++----
 .../DataSet/copyParentContentToDifferentPage.csv |  8 ++++----
 ...ateNCopyParentContentNHotelNOfferChildren.csv | 10 +++++-----
 ...LocalizeParentContentNHotelNOfferChildren.csv | 10 +++++-----
 .../Publish/DataSet/createParentContent.csv      |  6 +++---
 .../createParentContentNHotelNOfferChildren.csv  |  8 ++++----
 .../ForeignField/Publish/DataSet/deletePage.csv  |  6 +++---
 .../Publish/DataSet/deleteParentContent.csv      |  6 +++---
 .../localizeParentContentWAllChildren.csv        |  8 ++++----
 .../modifyNDiscardNModifyParentWHotelChild.csv   |  6 +++---
 .../Publish/DataSet/modifyOnlyHotelChild.csv     |  6 +++---
 .../ForeignField/Publish/DataSet/modifyPage.csv  |  6 +++---
 .../Publish/DataSet/modifyParentContent.csv      |  6 +++---
 .../DataSet/modifyParentNAddHotelChild.csv       |  8 ++++----
 .../modifyParentNChangeHotelChildrenSorting.csv  |  6 +++---
 .../DataSet/modifyParentNDeleteHotelChild.csv    |  6 +++---
 .../Publish/DataSet/modifyParentNHotelChild.csv  |  6 +++---
 .../DataSet/moveParentContentToDifferentPage.csv |  6 +++---
 ...arentContentToDifferentPageNChangeSorting.csv |  6 +++---
 .../moveParentContentToDifferentPageTwice.csv    |  6 +++---
 .../DataSet/changeParentContentSorting.csv       |  6 +++---
 .../ForeignField/PublishAll/DataSet/copyPage.csv | 12 ++++++------
 .../copyPageWHotelBeforeParentContent.csv        | 12 ++++++------
 .../PublishAll/DataSet/copyParentContent.csv     |  8 ++++----
 .../DataSet/copyParentContentToDifferentPage.csv |  8 ++++----
 ...ateNCopyParentContentNHotelNOfferChildren.csv | 10 +++++-----
 ...LocalizeParentContentNHotelNOfferChildren.csv | 10 +++++-----
 .../PublishAll/DataSet/createParentContent.csv   |  6 +++---
 .../createParentContentNHotelNOfferChildren.csv  |  8 ++++----
 .../PublishAll/DataSet/deletePage.csv            |  6 +++---
 .../PublishAll/DataSet/deleteParentContent.csv   |  6 +++---
 .../localizeParentContentWAllChildren.csv        |  8 ++++----
 .../modifyNDiscardNModifyParentWHotelChild.csv   |  6 +++---
 .../PublishAll/DataSet/modifyOnlyHotelChild.csv  |  6 +++---
 .../PublishAll/DataSet/modifyPage.csv            |  6 +++---
 .../PublishAll/DataSet/modifyParentContent.csv   |  6 +++---
 .../DataSet/modifyParentNAddHotelChild.csv       |  8 ++++----
 .../modifyParentNChangeHotelChildrenSorting.csv  |  6 +++---
 .../DataSet/modifyParentNDeleteHotelChild.csv    |  6 +++---
 .../DataSet/modifyParentNHotelChild.csv          |  6 +++---
 .../DataSet/moveParentContentToDifferentPage.csv |  6 +++---
 ...arentContentToDifferentPageNChangeSorting.csv |  6 +++---
 .../moveParentContentToDifferentPageTwice.csv    |  6 +++---
 140 files changed, 525 insertions(+), 520 deletions(-)

diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/DataSet/LiveDefaultElements.csv b/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/DataSet/LiveDefaultElements.csv
index 8e6733c8b466..8b5e16a214ae 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/DataSet/LiveDefaultElements.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/DataSet/LiveDefaultElements.csv
@@ -20,9 +20,9 @@
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",0,2,0,,
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
-,3,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",297,"tt_content",,0
-,4,89,2,0,0,0,,0,0,0,0,0,"Hotel #2",297,"tt_content",,0
-,5,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",298,"tt_content",,0
+,3,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,0
+,4,89,2,0,0,0,,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,0
+,5,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,0
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
 ,"1b70a8e25c22645f7a49a79f57f3cf3f","sys_category",31,"parent",,,,0,0,"sys_category",28,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/DataSet/ImportDefault.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/DataSet/ImportDefault.csv
index ac1edce5d899..5b9bca618fb2 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/DataSet/ImportDefault.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/DataSet/ImportDefault.csv
@@ -15,9 +15,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,2,0,0,0,,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
+,3,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,2,0,0,0,,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
 ,5,89,1,0,0,0,,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/changeParentContentSorting.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/changeParentContentSorting.csv
index 7dc6bf652bc1..c3e47020fabf 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/changeParentContentSorting.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/changeParentContentSorting.csv
@@ -15,9 +15,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
 ,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPage.csv
index 3c8ee5985a83..38364b66bd68 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPage.csv
@@ -18,13 +18,13 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
 ,6,91,1,0,0,0,2,0,0,0,0,"Hotel #0",91,"pages",,0
-,7,91,1,0,0,0,5,0,0,0,0,"Hotel #1",299,"tt_content",,1
-,8,91,1,0,0,0,3,0,0,0,0,"Hotel #1",300,"tt_content",,2
-,9,91,2,0,0,0,4,0,0,0,0,"Hotel #2",300,"tt_content",,1
+,7,91,1,0,0,0,5,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1
+,8,91,1,0,0,0,3,0,0,0,0,"Hotel #1",300,"tt_content",1nff.hotels,2
+,9,91,2,0,0,0,4,0,0,0,0,"Hotel #2",300,"tt_content",1nff.hotels,1
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
 ,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPageWHotelBeforeParentContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPageWHotelBeforeParentContent.csv
index e3c27b7e6668..593a7e00bf22 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPageWHotelBeforeParentContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPageWHotelBeforeParentContent.csv
@@ -18,13 +18,13 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
 ,6,91,1,0,0,0,2,0,0,0,0,"Hotel #0",91,"pages",,0
-,7,91,2,0,0,0,4,0,0,0,0,"Hotel #2",300,"tt_content",,1
-,8,91,1,0,0,0,3,0,0,0,0,"Hotel #1",300,"tt_content",,2
-,9,91,1,0,0,0,5,0,0,0,0,"Hotel #1",299,"tt_content",,1
+,7,91,2,0,0,0,4,0,0,0,0,"Hotel #2",300,"tt_content",1nff.hotels,1
+,8,91,1,0,0,0,3,0,0,0,0,"Hotel #1",300,"tt_content",1nff.hotels,2
+,9,91,1,0,0,0,5,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
 ,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContent.csv
index b045700bf4eb..5c7ff57aeb1d 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContent.csv
@@ -16,10 +16,10 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
-,6,89,1,0,0,0,5,0,0,0,0,"Hotel #1",299,"tt_content",,1
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
+,6,89,1,0,0,0,5,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
 ,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToDifferentPage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToDifferentPage.csv
index baff9e626db2..ec00d28fc6d3 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToDifferentPage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToDifferentPage.csv
@@ -16,10 +16,10 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","t3_origuid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
-,6,90,1,0,0,5,0,0,0,0,0,"Hotel #1",299,"tt_content",,1
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
+,6,90,1,0,0,5,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","t3_origuid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
 ,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToLanguageWAllChildren.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToLanguageWAllChildren.csv
index 7c19c74e2748..193b53111ee6 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToLanguageWAllChildren.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToLanguageWAllChildren.csv
@@ -17,10 +17,10 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
-,6,89,1,0,1,0,5,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",,1
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
+,6,89,1,0,1,0,5,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",1nff.hotels,1
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
 ,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNCopyParentContentNHotelNOfferChildren.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
index 5f896e255fad..c047d29a4791 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
@@ -17,11 +17,11 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
-,6,89,1,0,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",,1
-,7,89,1,0,0,0,6,0,0,0,0,"Hotel #1",300,"tt_content",,1
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
+,6,89,1,0,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1
+,7,89,1,0,0,0,6,0,0,0,0,"Hotel #1",300,"tt_content",1nff.hotels,1
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
 ,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
index 4d19493ea80e..5a9d7da754a0 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
@@ -18,11 +18,11 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
-,6,89,1,0,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",,1
-,7,89,1,0,1,6,6,0,0,0,0,"[Translate to Dansk:] Hotel #1",300,"tt_content",,1
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
+,6,89,1,0,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1
+,7,89,1,0,1,6,6,0,0,0,0,"[Translate to Dansk:] Hotel #1",300,"tt_content",1nff.hotels,1
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
 ,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildrenWOSortBy.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildrenWOSortBy.csv
index 52f28e76161e..9d4f9471279d 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildrenWOSortBy.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildrenWOSortBy.csv
@@ -18,11 +18,11 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
-,6,89,0,0,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",,1
-,7,89,0,0,1,6,6,0,0,0,0,"[Translate to Dansk:] Hotel #1",300,"tt_content",,1
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
+,6,89,0,0,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1
+,7,89,0,0,1,6,6,0,0,0,0,"[Translate to Dansk:] Hotel #1",300,"tt_content",1nff.hotels,1
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
 ,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContent.csv
index e7b557a9ead0..a8182214ecc7 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContent.csv
@@ -16,9 +16,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,2,0,0,0,,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
+,3,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,2,0,0,0,,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
 ,5,89,1,0,0,0,,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContentNHotelNOfferChildren.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContentNHotelNOfferChildren.csv
index e1e5a46ad906..ae78e5fd96fd 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContentNHotelNOfferChildren.csv
@@ -16,10 +16,10 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
-,6,89,1,0,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",,1
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
+,6,89,1,0,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
 ,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deletePage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deletePage.csv
index 8536bd55f041..74896f802025 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deletePage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deletePage.csv
@@ -15,9 +15,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,2,1,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,1,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
+,3,89,1,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,2,1,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,89,1,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
 ,5,89,1,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deleteParentContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deleteParentContent.csv
index 663c36e82d2a..4837bc72d1c3 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deleteParentContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deleteParentContent.csv
@@ -15,9 +15,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,1,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,89,1,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
 ,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/inlineLocalizeSynchronizeLocalizeMissing.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/inlineLocalizeSynchronizeLocalizeMissing.csv
index de313e8d2d77..cacc77360692 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/inlineLocalizeSynchronizeLocalizeMissing.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/inlineLocalizeSynchronizeLocalizeMissing.csv
@@ -17,12 +17,12 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
-,6,89,1,1,1,3,3,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",,2
-,7,89,1,0,1,4,4,0,0,0,0,"[Translate to Dansk:] Hotel #2",299,"tt_content",,1
-,8,89,2,0,1,3,3,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",,2
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
+,6,89,1,1,1,3,3,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",1nff.hotels,2
+,7,89,1,0,1,4,4,0,0,0,0,"[Translate to Dansk:] Hotel #2",299,"tt_content",1nff.hotels,1
+,8,89,2,0,1,3,3,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",1nff.hotels,2
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
 ,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeNCopyPageWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeNCopyPageWSynchronization.csv
index fc3ef3cde1cd..7f65053c88bd 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeNCopyPageWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeNCopyPageWSynchronization.csv
@@ -20,15 +20,15 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
 ,6,89,1,0,1,2,2,0,0,0,0,"[Translate to Dansk:] Hotel #0",91,"pages",,0
 ,7,92,1,0,0,0,2,0,0,0,0,"Hotel #0",92,"pages",,0
 ,8,92,1,0,1,7,6,0,0,0,0,"[Translate to Dansk:] Hotel #0",93,"pages",,0
-,9,92,1,0,0,0,5,0,0,0,0,"Hotel #1",299,"tt_content",,1
-,10,92,1,0,0,0,3,0,0,0,0,"Hotel #1",300,"tt_content",,2
-,11,92,2,0,0,0,4,0,0,0,0,"Hotel #2",300,"tt_content",,1
+,9,92,1,0,0,0,5,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1
+,10,92,1,0,0,0,3,0,0,0,0,"Hotel #1",300,"tt_content",1nff.hotels,2
+,11,92,2,0,0,0,4,0,0,0,0,"Hotel #2",300,"tt_content",1nff.hotels,1
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
 ,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageAddMonoglotHotelChildNCopyPageWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageAddMonoglotHotelChildNCopyPageWSynchronization.csv
index 2d44b43fa98a..526d7676514f 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageAddMonoglotHotelChildNCopyPageWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageAddMonoglotHotelChildNCopyPageWSynchronization.csv
@@ -20,9 +20,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,513,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,513,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
+,3,89,513,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,89,513,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
 ,6,89,1,0,0,0,2,0,0,0,0,"Hotel #0",91,"pages",,0
 ,7,89,2,0,0,0,0,0,0,0,0,"Hotel #007",89,"pages",,0
 ,8,89,2,0,0,0,0,0,0,0,0,"Hotel #007",91,"pages",,0
@@ -30,9 +30,9 @@
 ,10,92,2,0,0,0,7,0,0,0,0,"Hotel #007",92,"pages",,0
 ,11,92,1,0,0,0,6,0,0,0,0,"Hotel #0",93,"pages",,0
 ,12,92,2,0,0,0,8,0,0,0,0,"Hotel #007",93,"pages",,0
-,13,92,1,0,0,0,5,0,0,0,0,"Hotel #1",299,"tt_content",,1
-,14,92,1,0,0,0,3,0,0,0,0,"Hotel #1",300,"tt_content",,2
-,15,92,2,0,0,0,4,0,0,0,0,"Hotel #2",300,"tt_content",,1
+,13,92,1,0,0,0,5,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1
+,14,92,1,0,0,0,3,0,0,0,0,"Hotel #1",300,"tt_content",1nff.hotels,2
+,15,92,2,0,0,0,4,0,0,0,0,"Hotel #2",300,"tt_content",1nff.hotels,1
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
 ,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddHotelChildWExclude.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddHotelChildWExclude.csv
index 10f4657a80dd..253b6d91f852 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddHotelChildWExclude.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddHotelChildWExclude.csv
@@ -16,9 +16,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,513,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,513,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
+,3,89,513,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,89,513,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
 ,6,89,1,0,1,2,2,0,0,0,0,"Hotel #0",91,"pages",,0
 ,7,89,2,0,0,0,0,0,0,0,0,"Hotel #007",89,"pages",,0
 ,8,89,2,0,1,7,0,0,0,0,0,"Hotel #007",91,"pages",,0
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddHotelChildWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddHotelChildWSynchronization.csv
index 1567c7396db5..d29824b96d5c 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddHotelChildWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddHotelChildWSynchronization.csv
@@ -16,9 +16,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,513,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,513,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
+,3,89,513,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,89,513,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
 ,6,89,1,0,1,2,2,0,0,0,0,"[Translate to Dansk:] Hotel #0",91,"pages",,0
 ,7,89,2,0,0,0,0,0,0,0,0,"Hotel #007",89,"pages",,0
 ,8,89,2,0,1,7,0,0,0,0,0,"[Translate to Dansk:] Hotel #007",91,"pages",,0
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddMonoglotHotelChildWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddMonoglotHotelChildWSynchronization.csv
index 4018c49f9edf..1aa318885cc0 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddMonoglotHotelChildWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddMonoglotHotelChildWSynchronization.csv
@@ -16,9 +16,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,513,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,513,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
+,3,89,513,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,89,513,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
 ,6,89,1,0,0,0,2,0,0,0,0,"Hotel #0",91,"pages",,0
 ,7,89,2,0,0,0,0,0,0,0,0,"Hotel #007",89,"pages",,0
 ,8,89,2,0,0,0,0,0,0,0,0,"Hotel #007",91,"pages",,0
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageTwiceWExclude.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageTwiceWExclude.csv
index 4cea860d6131..0460387c8fce 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageTwiceWExclude.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageTwiceWExclude.csv
@@ -17,9 +17,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
 ,6,89,1,0,1,2,2,0,0,0,0,"Hotel #0",91,"pages",,0
 ,7,89,1,0,2,2,2,0,0,0,0,"Hotel #0",92,"pages",,0
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWExclude.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWExclude.csv
index 2c3191854339..824d8524e208 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWExclude.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWExclude.csv
@@ -16,9 +16,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
 ,6,89,1,0,1,2,2,0,0,0,0,"Hotel #0",91,"pages",,0
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWSynchronization.csv
index 6ad266fcace8..e598204f44e2 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWSynchronization.csv
@@ -16,9 +16,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
 ,6,89,1,0,1,2,2,0,0,0,0,"[Translate to Dansk:] Hotel #0",91,"pages",,0
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWithSynchronizationAndCustomLocalizedHotel.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWithSynchronizationAndCustomLocalizedHotel.csv
index ad4bfc2e69a2..a41af7303ea6 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWithSynchronizationAndCustomLocalizedHotel.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWithSynchronizationAndCustomLocalizedHotel.csv
@@ -16,9 +16,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,
-,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,
+,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,
 ,6,89,1,0,1,2,2,0,0,0,0,"[Translate to Dansk:] Hotel #0",91,"pages",,0,
 ,7,89,2,0,1,0,0,0,0,0,0,"Hotel in dansk page only",91,"pages",,0,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentChainLanguageSynchronizationSource.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentChainLanguageSynchronizationSource.csv
index fbd785e10fd7..4b016b022b94 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentChainLanguageSynchronizationSource.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentChainLanguageSynchronizationSource.csv
@@ -19,14 +19,14 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l10n_source","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,513,0,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,513,0,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,1538,0,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,1,0,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
-,6,89,1,0,1,5,5,5,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",,1
-,7,89,1,0,2,5,6,6,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Hotel #1",300,"tt_content",,1
-,8,89,2,0,0,0,0,0,0,0,0,0,"Hotel #2",298,"tt_content",,0
-,9,89,2,0,1,8,8,0,0,0,0,0,"[Translate to Dansk:] Hotel #2",299,"tt_content",,0
-,10,89,2,0,2,8,8,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Hotel #2",300,"tt_content",,0
+,3,89,513,0,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,1538,0,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,89,1,0,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
+,6,89,1,0,1,5,5,5,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",1nff.hotels,1
+,7,89,1,0,2,5,6,6,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Hotel #1",300,"tt_content",1nff.hotels,1
+,8,89,2,0,0,0,0,0,0,0,0,0,"Hotel #2",298,"tt_content",1nff.hotels,0
+,9,89,2,0,1,8,8,0,0,0,0,0,"[Translate to Dansk:] Hotel #2",299,"tt_content",1nff.hotels,0
+,10,89,2,0,2,8,8,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Hotel #2",300,"tt_content",1nff.hotels,0
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l10n_source","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
 ,5,89,1,0,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentNCreateNestedChildrenWLanguageSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentNCreateNestedChildrenWLanguageSynchronization.csv
index 3376843e61cd..388933592960 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentNCreateNestedChildrenWLanguageSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentNCreateNestedChildrenWLanguageSynchronization.csv
@@ -17,12 +17,12 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers","l10n_state"
 ,2,89,513,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,"\NULL"
-,3,89,513,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,"\NULL"
-,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,"\NULL"
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,"\NULL"
-,6,89,1,0,1,5,5,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",,1,"{""offers"":""parent""}"
-,7,89,2,0,0,0,0,0,0,0,0,"New Hotel #1",298,"tt_content",,1,"\NULL"
-,8,89,2,0,1,7,0,0,0,0,0,"[Translate to Dansk:] New Hotel #1",299,"tt_content",,1,"{""offers"":""parent""}"
+,3,89,513,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,"\NULL"
+,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,"\NULL"
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,"\NULL"
+,6,89,1,0,1,5,5,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",1nff.hotels,1,"{""offers"":""parent""}"
+,7,89,2,0,0,0,0,0,0,0,0,"New Hotel #1",298,"tt_content",1nff.hotels,1,"\NULL"
+,8,89,2,0,1,7,0,0,0,0,0,"[Translate to Dansk:] New Hotel #1",299,"tt_content",1nff.hotels,1,"{""offers"":""parent""}"
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices","l10n_state"
 ,5,89,513,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,"\NULL"
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentSynchronization.csv
index 2414a705b7aa..c5a1f1433aaa 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentSynchronization.csv
@@ -17,10 +17,10 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers","l10n_state"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,"\NULL"
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,"\NULL"
-,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,"\NULL"
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,"\NULL"
-,6,89,1,0,1,5,5,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",,1,"{""offers"":""parent""}"
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,"\NULL"
+,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,"\NULL"
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,"\NULL"
+,6,89,1,0,1,5,5,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",1nff.hotels,1,"{""offers"":""parent""}"
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices","l10n_state"
 ,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,"\NULL"
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentWAllChildren.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentWAllChildren.csv
index 068d937f496f..54384f24af3a 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentWAllChildren.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentWAllChildren.csv
@@ -17,10 +17,10 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
-,6,89,1,0,1,5,5,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",,1
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
+,6,89,1,0,1,5,5,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",1nff.hotels,1
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
 ,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyOnlyHotelChild.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyOnlyHotelChild.csv
index 6bc0bbcb4a06..9f3c15cf397f 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyOnlyHotelChild.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyOnlyHotelChild.csv
@@ -15,9 +15,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,2,0,0,0,0,0,0,0,0,"Testing #1",297,"tt_content",,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,2,0,0,0,0,0,0,0,0,"Testing #1",297,"tt_content",1nff.hotels,1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
 ,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyPage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyPage.csv
index 10dad7466999..b315e87a7bbb 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyPage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyPage.csv
@@ -15,9 +15,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,2,0,0,0,,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
+,3,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,2,0,0,0,,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
 ,5,89,1,0,0,0,,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentContent.csv
index c2fd0048a18e..2b69b836f498 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentContent.csv
@@ -15,9 +15,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,2,0,0,0,,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
+,3,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,2,0,0,0,,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
 ,5,89,1,0,0,0,,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNAddHotelChild.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNAddHotelChild.csv
index d71561d2a9d5..31b9ab4f350d 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNAddHotelChild.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNAddHotelChild.csv
@@ -15,10 +15,10 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
-,6,89,2,0,0,0,0,0,0,0,0,"Hotel #2",298,"tt_content",,0
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
+,6,89,2,0,0,0,0,0,0,0,0,"Hotel #2",298,"tt_content",1nff.hotels,0
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
 ,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNChangeHotelChildrenSorting.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNChangeHotelChildrenSorting.csv
index 860ee940467e..a89e45d0209e 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNChangeHotelChildrenSorting.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNChangeHotelChildrenSorting.csv
@@ -15,9 +15,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,2,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,1,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
+,3,89,2,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,1,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
 ,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNDeleteHotelChild.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNDeleteHotelChild.csv
index e819aa4a1d53..5fdaee00c554 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNDeleteHotelChild.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNDeleteHotelChild.csv
@@ -15,9 +15,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,2,1,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,2,1,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
 ,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNHotelChild.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNHotelChild.csv
index 6bc0bbcb4a06..9f3c15cf397f 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNHotelChild.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNHotelChild.csv
@@ -15,9 +15,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,2,0,0,0,0,0,0,0,0,"Testing #1",297,"tt_content",,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,2,0,0,0,0,0,0,0,0,"Testing #1",297,"tt_content",1nff.hotels,1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
 ,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPage.csv
index dffcbf6ef382..1b4bcd6700d2 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPage.csv
@@ -15,9 +15,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,90,256,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,90,256,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
 ,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPageNChangeSorting.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
index 7c5dad651a6e..37c1856c984f 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
@@ -15,9 +15,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,90,64,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,90,128,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,90,256,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
+,3,90,64,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,90,128,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,90,256,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
 ,5,90,32,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/Overrides/tt_content.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/Overrides/tt_content.php
index b0ef738ab309..f664a1c20119 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/Overrides/tt_content.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/Overrides/tt_content.php
@@ -20,6 +20,11 @@ $GLOBALS['TCA']['tt_content']['ctrl']['hideAtCopy'] = false;
                 'foreign_table' => 'tx_irretutorial_1nff_hotel',
                 'foreign_field' => 'parentid',
                 'foreign_table_field' => 'parenttable',
+                'foreign_match_fields' => [
+                    // The flex from field below has an inline relation to hotels, too. The
+                    // child table needs a unique string to distinguish the two relations.
+                    'parentidentifier' => '1nff.hotels',
+                ],
                 'maxitems' => 10,
                 'appearance' => [
                     'showSynchronizationLink' => 1,
diff --git a/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseAssertions/importIrreRecords.csv b/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseAssertions/importIrreRecords.csv
index 2c5fc380a8bd..0354e0cf9f43 100644
--- a/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseAssertions/importIrreRecords.csv
+++ b/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseAssertions/importIrreRecords.csv
@@ -20,8 +20,8 @@
 ,3,1,1,0,0,64,0,0,"Price 2.2.1 (csv)",112.00,,,
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,
 ,"uid","pid","cruser_id","sys_language_uid","l18n_parent","sorting","deleted","hidden","parentid","parenttable","parentidentifier","title","offers"
-,1,1,1,0,0,2,0,0,1,"tt_content",,"Hotel 2 (nff)",1
-,2,1,1,0,0,1,0,0,1,"tt_content",,"Hotel 1 (nff)",2
+,1,1,1,0,0,2,0,0,1,"tt_content",1nff.hotels,"Hotel 2 (nff)",1
+,2,1,1,0,0,1,0,0,1,"tt_content",1nff.hotels,"Hotel 1 (nff)",2
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,
 ,"uid","pid","cruser_id","sys_language_uid","l18n_parent","sorting","deleted","hidden","parentid","parenttable","parentidentifier","title","prices"
 ,1,1,1,0,0,2,0,0,2,"tx_irretutorial_1nff_hotel",,"Offer 1.2 (nff)",1
diff --git a/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseImports/irre_tutorial.xml b/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseImports/irre_tutorial.xml
index dff5291a1cd1..f3baa6cb70dc 100644
--- a/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseImports/irre_tutorial.xml
+++ b/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseImports/irre_tutorial.xml
@@ -153,7 +153,7 @@
 		<hidden>0</hidden>
 		<parentid>1</parentid>
 		<parenttable>tt_content</parenttable>
-		<parentidentifier></parentidentifier>
+		<parentidentifier>1nff.hotels</parentidentifier>
 		<title>Hotel 1 (nff)</title>
 		<offers>2</offers>
         <sorting>128</sorting>
@@ -170,7 +170,7 @@
 		<hidden>0</hidden>
 		<parentid>1</parentid>
 		<parenttable>tt_content</parenttable>
-		<parentidentifier></parentidentifier>
+		<parentidentifier>1nff.hotels</parentidentifier>
 		<title>Hotel 2 (nff)</title>
 		<offers>1</offers>
         <sorting>256</sorting>
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 845461c2a4f9..360a334b5a6b 100644
--- a/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlExports/irre-records.xml
+++ b/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlExports/irre-records.xml
@@ -931,7 +931,7 @@
 				<field index="l18n_parent" type="integer">0</field>
 				<field index="parentid" type="integer">1</field>
 				<field index="parenttable">tt_content</field>
-				<field index="parentidentifier"></field>
+				<field index="parentidentifier">1nff.hotels</field>
 				<field index="title">Hotel 1 (nff)</field>
 				<field index="offers" type="integer">2</field>
 			</fieldlist>
@@ -963,7 +963,7 @@
 				<field index="l18n_parent" type="integer">0</field>
 				<field index="parentid" type="integer">1</field>
 				<field index="parenttable">tt_content</field>
-				<field index="parentidentifier"></field>
+				<field index="parentidentifier">1nff.hotels</field>
 				<field index="title">Hotel 2 (nff)</field>
 				<field index="offers" type="integer">1</field>
 			</fieldlist>
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 6bbaf747ff3c..7fb4455c8a6c 100644
--- a/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlImports/irre-records.xml
+++ b/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlImports/irre-records.xml
@@ -930,7 +930,7 @@
 				<field index="l18n_parent" type="integer">0</field>
 				<field index="parentid" type="integer">1</field>
 				<field index="parenttable">tt_content</field>
-				<field index="parentidentifier"></field>
+				<field index="parentidentifier">1nff.hotels</field>
 				<field index="title">Hotel 1 (nff)</field>
 				<field index="offers" type="integer">2</field>
 			</fieldlist>
@@ -962,7 +962,7 @@
 				<field index="l18n_parent" type="integer">0</field>
 				<field index="parentid" type="integer">1</field>
 				<field index="parenttable">tt_content</field>
-				<field index="parentidentifier"></field>
+				<field index="parentidentifier">1nff.hotels</field>
 				<field index="title">Hotel 2 (nff)</field>
 				<field index="offers" type="integer">1</field>
 			</fieldlist>
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/DataSet/ImportDefault.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/DataSet/ImportDefault.csv
index 0cc7b759303b..f58c1f3a3057 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/DataSet/ImportDefault.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/DataSet/ImportDefault.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",
 ,2,89,1,0,0,0,,0,0,0,0,"Hotel #0",89,"pages",,0,
-,3,89,1,0,0,0,,0,0,0,0,"Hotel #1",297,"tt_content",,2,
-,4,89,2,0,0,0,,0,0,0,0,"Hotel #2",297,"tt_content",,1,
-,5,89,1,0,0,0,,0,0,0,0,"Hotel #1",298,"tt_content",,1,
+,3,89,1,0,0,0,,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,
+,4,89,2,0,0,0,,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,
+,5,89,1,0,0,0,,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",
 ,5,89,1,0,0,0,,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/changeParentContentSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/changeParentContentSorting.csv
index 7fbe46a73408..5328e2554c78 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/changeParentContentSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/changeParentContentSorting.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyPage.csv
index 7fbe46a73408..5328e2554c78 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyPage.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyPageWHotelBeforeParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyPageWHotelBeforeParentContent.csv
index 7fbe46a73408..5328e2554c78 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyPageWHotelBeforeParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyPageWHotelBeforeParentContent.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyParentContent.csv
index 7fbe46a73408..5328e2554c78 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyParentContent.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyParentContentToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyParentContentToDifferentPage.csv
index 7fbe46a73408..5328e2554c78 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyParentContentToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyParentContentToDifferentPage.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createNCopyParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
index 69af351dd0fd..fc3225073f25 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
@@ -23,10 +23,10 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,89,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,89,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv
index e9c5b7302e70..ac704f9efd9f 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv
@@ -23,10 +23,10 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,89,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,89,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
index f1fc265dd423..f51f1abcb723 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
@@ -23,9 +23,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createParentContent.csv
index 1beaffd1c559..0b2f23a9d70f 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createParentContent.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",
 ,2,89,1,0,0,0,,0,0,0,0,"Hotel #0",89,"pages",,0,
-,3,89,1,0,0,0,,0,0,0,0,"Hotel #1",297,"tt_content",,2,
-,4,89,2,0,0,0,,0,0,0,0,"Hotel #2",297,"tt_content",,1,
-,5,89,1,0,0,0,,0,0,0,0,"Hotel #1",298,"tt_content",,1,
+,3,89,1,0,0,0,,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,
+,4,89,2,0,0,0,,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,
+,5,89,1,0,0,0,,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",
 ,5,89,1,0,0,0,,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createParentContentNHotelNOfferChildren.csv
index 7fbe46a73408..5328e2554c78 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createParentContentNHotelNOfferChildren.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/deletePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/deletePage.csv
index 7fbe46a73408..5328e2554c78 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/deletePage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/deletePage.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/deleteParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/deleteParentContent.csv
index 7fbe46a73408..5328e2554c78 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/deleteParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/deleteParentContent.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/localizeParentContentWAllChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/localizeParentContentWAllChildren.csv
index 6fafae4a3890..79db96931516 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/localizeParentContentWAllChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/localizeParentContentWAllChildren.csv
@@ -23,9 +23,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyNDiscardNModifyParentWHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
index 7fbe46a73408..5328e2554c78 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyOnlyHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyOnlyHotelChild.csv
index 7fbe46a73408..5328e2554c78 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyOnlyHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyOnlyHotelChild.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyPage.csv
index 7fbe46a73408..5328e2554c78 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyPage.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentContent.csv
index 7fbe46a73408..5328e2554c78 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentContent.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNAddHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNAddHotelChild.csv
index 7fbe46a73408..5328e2554c78 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNAddHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNAddHotelChild.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNChangeHotelChildrenSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNChangeHotelChildrenSorting.csv
index 7fbe46a73408..5328e2554c78 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNChangeHotelChildrenSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNChangeHotelChildrenSorting.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNDeleteHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNDeleteHotelChild.csv
index 7fbe46a73408..5328e2554c78 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNDeleteHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNDeleteHotelChild.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNHotelChild.csv
index 7fbe46a73408..5328e2554c78 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNHotelChild.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/moveParentContentToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/moveParentContentToDifferentPage.csv
index 7fbe46a73408..5328e2554c78 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/moveParentContentToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/moveParentContentToDifferentPage.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/moveParentContentToDifferentPageNChangeSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
index 7fbe46a73408..5328e2554c78 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/moveParentContentToDifferentPageTwice.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/moveParentContentToDifferentPageTwice.csv
index 7fbe46a73408..5328e2554c78 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/moveParentContentToDifferentPageTwice.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/moveParentContentToDifferentPageTwice.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/changeHotelSortingWithOfferNotWorkspaceAware.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/changeHotelSortingWithOfferNotWorkspaceAware.csv
index 874816612a60..637f8f42b94e 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/changeHotelSortingWithOfferNotWorkspaceAware.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/changeHotelSortingWithOfferNotWorkspaceAware.csv
@@ -22,10 +22,10 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,89,258,0,0,0,1,4,0,3,"Hotel #1",297,"tt_content",,2,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,89,258,0,0,0,1,4,0,3,"Hotel #1",297,"tt_content",1nff.hotels,2,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/changeParentContentSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/changeParentContentSorting.csv
index b2ba4e2a8506..f47e302eabce 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/changeParentContentSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/changeParentContentSorting.csv
@@ -23,11 +23,11 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,89,1,0,0,0,1,0,0,3,"Hotel #1",297,"tt_content",,2,,
-,7,89,2,0,0,0,1,0,0,4,"Hotel #2",297,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,89,1,0,0,0,1,0,0,3,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,7,89,2,0,0,0,1,0,0,4,"Hotel #2",297,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPage.csv
index 29d778e89486..5722e522dbf3 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPage.csv
@@ -25,13 +25,13 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 ,6,91,1,0,0,0,1,1,0,0,"Hotel #0",91,"pages",,0,,
-,7,91,513,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content",,1,,
-,8,91,1,0,0,0,1,1,0,0,"Hotel #1",300,"tt_content",,2,,
-,9,91,2,0,0,0,1,1,0,0,"Hotel #2",300,"tt_content",,1,,
+,7,91,513,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
+,8,91,1,0,0,0,1,1,0,0,"Hotel #1",300,"tt_content",1nff.hotels,2,,
+,9,91,2,0,0,0,1,1,0,0,"Hotel #2",300,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPageWHotelBeforeParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPageWHotelBeforeParentContent.csv
index b637136e7b5d..4dab237084f0 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPageWHotelBeforeParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPageWHotelBeforeParentContent.csv
@@ -25,13 +25,13 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 ,6,91,1,0,0,0,1,1,0,0,"Hotel #0",91,"pages",,0,,
-,7,91,2,0,0,0,1,1,0,0,"Hotel #2",300,"tt_content",,1,,
-,8,91,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content",,1,,
-,9,91,1,0,0,0,1,1,0,0,"Hotel #1",300,"tt_content",,2,,
+,7,91,2,0,0,0,1,1,0,0,"Hotel #2",300,"tt_content",1nff.hotels,1,,
+,8,91,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
+,9,91,1,0,0,0,1,1,0,0,"Hotel #1",300,"tt_content",1nff.hotels,2,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContent.csv
index 9340e3029f6a..b55ba1707563 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContent.csv
@@ -23,10 +23,10 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,89,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,89,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToDifferentPage.csv
index 2e2ffa58b6e0..f2a41298daf4 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToDifferentPage.csv
@@ -23,10 +23,10 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,90,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,90,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNCopyParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
index 5e701cca9f88..fa5b06027269 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
@@ -24,11 +24,11 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,89,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content",,1,,
-,7,89,1,0,0,0,1,1,0,0,"Hotel #1",300,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,89,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
+,7,89,1,0,0,0,1,1,0,0,"Hotel #1",300,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
index 24592a57c554..9d7180806f61 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
@@ -25,11 +25,11 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,89,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content",,1,,
-,7,89,1,0,1,6,1,1,0,0,"[Translate to Dansk:] Hotel #1",300,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,89,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
+,7,89,1,0,1,6,1,1,0,0,"[Translate to Dansk:] Hotel #1",300,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildrenWOSortBy.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildrenWOSortBy.csv
index 09a64b74abdd..108f11e1947b 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildrenWOSortBy.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildrenWOSortBy.csv
@@ -25,11 +25,11 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,89,0,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content",,1,,
-,7,89,0,0,1,6,1,1,0,0,"[Translate to Dansk:] Hotel #1",300,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,89,0,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
+,7,89,0,0,1,6,1,1,0,0,"[Translate to Dansk:] Hotel #1",300,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContent.csv
index 5adbda8abba8..f193a35dbfa1 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContent.csv
@@ -23,9 +23,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",
 ,2,89,1,0,0,0,,0,0,0,0,"Hotel #0",89,"pages",,0,
-,3,89,1,0,0,0,,0,0,0,0,"Hotel #1",297,"tt_content",,2,
-,4,89,2,0,0,0,,0,0,0,0,"Hotel #2",297,"tt_content",,1,
-,5,89,1,0,0,0,,0,0,0,0,"Hotel #1",298,"tt_content",,1,
+,3,89,1,0,0,0,,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,
+,4,89,2,0,0,0,,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,
+,5,89,1,0,0,0,,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",
 ,5,89,1,0,0,0,,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContentNHotelNOfferChildren.csv
index 69af351dd0fd..fc3225073f25 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContentNHotelNOfferChildren.csv
@@ -23,10 +23,10 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,89,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,89,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deletePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deletePage.csv
index 56357bc20071..ff4e5e4c6035 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deletePage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deletePage.csv
@@ -23,9 +23,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 ,6,89,1,0,0,0,1,2,0,2,"Hotel #0",89,"pages",,0,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deleteParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deleteParentContent.csv
index 2e4e684f73db..2ed0fb9cf1c6 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deleteParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deleteParentContent.csv
@@ -23,10 +23,10 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,89,1,0,0,0,1,2,0,5,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,89,1,0,0,0,1,2,0,5,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/inlineLocalizeSynchronizeLocalizeMissing.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/inlineLocalizeSynchronizeLocalizeMissing.csv
index 2610b07df304..304f72fae7e9 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/inlineLocalizeSynchronizeLocalizeMissing.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/inlineLocalizeSynchronizeLocalizeMissing.csv
@@ -17,11 +17,11 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
-,7,89,1,0,1,4,4,1,1,0,0,"[Translate to Dansk:] Hotel #2",299,"tt_content",,1
-,8,89,2,0,1,3,3,1,1,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",,2
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
+,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
+,7,89,1,0,1,4,4,1,1,0,0,"[Translate to Dansk:] Hotel #2",299,"tt_content",1nff.hotels,1
+,8,89,2,0,1,3,3,1,1,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",1nff.hotels,2
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
 ,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentWAllChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentWAllChildren.csv
index 327d52a949a1..8b2cb2cb8c0d 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentWAllChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentWAllChildren.csv
@@ -24,10 +24,10 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,89,1,0,1,5,1,1,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,89,1,0,1,5,1,1,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyNDiscardNModifyParentWHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
index 87f4c7be0611..48f290a5e5df 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
@@ -23,11 +23,11 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,8,89,1,0,0,0,1,0,0,3,"Hotel #1",297,"tt_content",,2,,
-,9,89,2,0,0,0,1,0,0,4,"Testing #2",297,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,8,89,1,0,0,0,1,0,0,3,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,9,89,2,0,0,0,1,0,0,4,"Testing #2",297,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyOnlyHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyOnlyHotelChild.csv
index a523aed7b1e2..cc8432235d1f 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyOnlyHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyOnlyHotelChild.csv
@@ -22,10 +22,10 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,89,2,0,0,0,1,0,0,4,"Testing #1",297,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,89,2,0,0,0,1,0,0,4,"Testing #1",297,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyPage.csv
index 3fee36827c24..3534d4d7d251 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyPage.csv
@@ -23,9 +23,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 ,6,89,1,0,0,0,1,0,0,2,"Hotel #0",89,"pages",,0,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentContent.csv
index 32a6a0286232..8888b9e2b94e 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentContent.csv
@@ -23,10 +23,10 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,89,1,0,0,0,1,0,0,5,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,89,1,0,0,0,1,0,0,5,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNAddHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNAddHotelChild.csv
index 815ef2eef387..9b69744ecd28 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNAddHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNAddHotelChild.csv
@@ -23,11 +23,11 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,89,1,0,0,0,1,0,0,5,"Hotel #1",298,"tt_content",,1,,
-,7,89,2,0,0,0,1,1,0,0,"Hotel #2",298,"tt_content",,0,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,89,1,0,0,0,1,0,0,5,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,7,89,2,0,0,0,1,1,0,0,"Hotel #2",298,"tt_content",1nff.hotels,0,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNChangeHotelChildrenSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNChangeHotelChildrenSorting.csv
index 15d30dc5c156..0ff2cbab0fbf 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNChangeHotelChildrenSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNChangeHotelChildrenSorting.csv
@@ -23,11 +23,11 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,89,2,0,0,0,1,0,0,3,"Hotel #1",297,"tt_content",,2,,
-,7,89,1,0,0,0,1,0,0,4,"Hotel #2",297,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,89,2,0,0,0,1,0,0,3,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,7,89,1,0,0,0,1,0,0,4,"Hotel #2",297,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNDeleteHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNDeleteHotelChild.csv
index 14c3497e9145..8ab0a7c2d701 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNDeleteHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNDeleteHotelChild.csv
@@ -23,11 +23,11 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,89,1,0,0,0,1,0,0,3,"Hotel #1",297,"tt_content",,2,,
-,7,89,2,0,0,0,1,2,0,4,"Hotel #2",297,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,89,1,0,0,0,1,0,0,3,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,7,89,2,0,0,0,1,2,0,4,"Hotel #2",297,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNHotelChild.csv
index 99e1e35ab3a9..bae18528f49e 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNHotelChild.csv
@@ -23,11 +23,11 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,89,1,0,0,0,1,0,0,3,"Hotel #1",297,"tt_content",,2,,
-,7,89,2,0,0,0,1,0,0,4,"Testing #1",297,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,89,1,0,0,0,1,0,0,3,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,7,89,2,0,0,0,1,0,0,4,"Testing #1",297,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPage.csv
index cf65573fe681..d76023e0df18 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPage.csv
@@ -23,10 +23,10 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,90,256,0,0,0,1,4,0,5,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,90,256,0,0,0,1,4,0,5,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPageNChangeSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
index 4fa5ba5cff9b..b3c0b6f09642 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
@@ -24,12 +24,12 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,90,256,0,0,0,1,4,0,5,"Hotel #1",298,"tt_content",,1,,
-,7,90,64,0,0,0,1,4,0,3,"Hotel #1",297,"tt_content",,2,,
-,8,90,128,0,0,0,1,4,0,4,"Hotel #2",297,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,90,256,0,0,0,1,4,0,5,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,7,90,64,0,0,0,1,4,0,3,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,8,90,128,0,0,0,1,4,0,4,"Hotel #2",297,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPageTwice.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPageTwice.csv
index 9051d373f5ba..ead245f1d825 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPageTwice.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPageTwice.csv
@@ -23,10 +23,10 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,1,256,0,0,0,1,4,0,5,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,1,256,0,0,0,1,4,0,5,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/changeParentContentSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/changeParentContentSorting.csv
index 180b95bc8593..ddeac7ffe35f 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/changeParentContentSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/changeParentContentSorting.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyPage.csv
index 0c28ea069449..f11ed46c79e4 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyPage.csv
@@ -25,13 +25,13 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 ,6,91,1,0,0,0,0,0,0,0,"Hotel #0",91,"pages",,0,,
-,7,91,513,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",,1,,
-,8,91,1,0,0,0,0,0,0,0,"Hotel #1",300,"tt_content",,2,,
-,9,91,2,0,0,0,0,0,0,0,"Hotel #2",300,"tt_content",,1,,
+,7,91,513,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
+,8,91,1,0,0,0,0,0,0,0,"Hotel #1",300,"tt_content",1nff.hotels,2,,
+,9,91,2,0,0,0,0,0,0,0,"Hotel #2",300,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyPageWHotelBeforeParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyPageWHotelBeforeParentContent.csv
index 3376067252f3..90a9ddd59923 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyPageWHotelBeforeParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyPageWHotelBeforeParentContent.csv
@@ -25,13 +25,13 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 ,6,91,1,0,0,0,0,0,0,0,"Hotel #0",91,"pages",,0,,
-,7,91,2,0,0,0,0,0,0,0,"Hotel #2",300,"tt_content",,1,,
-,8,91,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",,1,,
-,9,91,1,0,0,0,0,0,0,0,"Hotel #1",300,"tt_content",,2,,
+,7,91,2,0,0,0,0,0,0,0,"Hotel #2",300,"tt_content",1nff.hotels,1,,
+,8,91,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
+,9,91,1,0,0,0,0,0,0,0,"Hotel #1",300,"tt_content",1nff.hotels,2,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyParentContent.csv
index 70751b89aa5b..0bf85c412ad9 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyParentContent.csv
@@ -23,10 +23,10 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyParentContentToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyParentContentToDifferentPage.csv
index 725cb3a1a905..862c2c0a65c6 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyParentContentToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyParentContentToDifferentPage.csv
@@ -23,10 +23,10 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,90,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,90,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNCopyParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
index 490944901b4d..5f629bfc2546 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
@@ -24,11 +24,11 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",,1,,
-,7,89,1,0,0,0,0,0,0,0,"Hotel #1",300,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
+,7,89,1,0,0,0,0,0,0,0,"Hotel #1",300,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
index c00ee379faef..2c6605eb6101 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
@@ -25,11 +25,11 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",,1,,
-,7,89,1,0,1,6,0,0,0,0,"[Translate to Dansk:] Hotel #1",300,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
+,7,89,1,0,1,6,0,0,0,0,"[Translate to Dansk:] Hotel #1",300,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createParentContent.csv
index b268ae1b55e6..a6b3d6177766 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createParentContent.csv
@@ -23,9 +23,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",
 ,2,89,1,0,0,0,,0,0,0,0,"Hotel #0",89,"pages",,0,
-,3,89,1,0,0,0,,0,0,0,0,"Hotel #1",297,"tt_content",,2,
-,4,89,2,0,0,0,,0,0,0,0,"Hotel #2",297,"tt_content",,1,
-,5,89,1,0,0,0,,0,0,0,0,"Hotel #1",298,"tt_content",,1,
+,3,89,1,0,0,0,,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,
+,4,89,2,0,0,0,,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,
+,5,89,1,0,0,0,,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",
 ,5,89,1,0,0,0,,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createParentContentNHotelNOfferChildren.csv
index 54646eed2994..e071b16cf1ee 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createParentContentNHotelNOfferChildren.csv
@@ -23,10 +23,10 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/deletePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/deletePage.csv
index 07f328da3e6d..63c13a897e58 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/deletePage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/deletePage.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,1,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,1,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,1,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,1,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,1,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,1,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,1,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,1,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/deleteParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/deleteParentContent.csv
index 04f0cc988e5b..7db844229fe9 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/deleteParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/deleteParentContent.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,1,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,1,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/localizeParentContentWAllChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/localizeParentContentWAllChildren.csv
index bbb1ed32640a..7c80bb8c4e2a 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/localizeParentContentWAllChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/localizeParentContentWAllChildren.csv
@@ -24,10 +24,10 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,89,1,0,1,5,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,89,1,0,1,5,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyNDiscardNModifyParentWHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
index c410ede120e9..75a7ed50ed8d 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Testing #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Testing #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyOnlyHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyOnlyHotelChild.csv
index 950a13084cef..e60ecf687de0 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyOnlyHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyOnlyHotelChild.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Testing #1",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Testing #1",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyPage.csv
index 62d864b59a09..9222486d3c71 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyPage.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentContent.csv
index 9d8b12900974..36ebb54cdfe9 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentContent.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNAddHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNAddHotelChild.csv
index c78ef3cc662b..0b17ed989ea2 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNAddHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNAddHotelChild.csv
@@ -22,10 +22,10 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,7,89,2,0,0,0,0,0,0,0,"Hotel #2",298,"tt_content",,0,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,7,89,2,0,0,0,0,0,0,0,"Hotel #2",298,"tt_content",1nff.hotels,0,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNChangeHotelChildrenSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNChangeHotelChildrenSorting.csv
index 7c4d5c269700..535eb93e34bb 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNChangeHotelChildrenSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNChangeHotelChildrenSorting.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,2,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,1,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,2,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,1,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNDeleteHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNDeleteHotelChild.csv
index e39fcfb25710..3eb44caa1915 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNDeleteHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNDeleteHotelChild.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,1,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,1,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNHotelChild.csv
index 950a13084cef..e60ecf687de0 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNHotelChild.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Testing #1",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Testing #1",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPage.csv
index d21ba7865704..414a11178ffb 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPage.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,90,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,90,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPageNChangeSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
index dbe0ec7a2f8d..a312bcfcb6f0 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,90,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,90,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,90,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,90,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,90,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,90,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,90,2,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPageTwice.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPageTwice.csv
index 713be594d87f..4e3302a4a0ce 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPageTwice.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPageTwice.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,1,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,1,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/changeParentContentSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/changeParentContentSorting.csv
index 180b95bc8593..ddeac7ffe35f 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/changeParentContentSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/changeParentContentSorting.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyPage.csv
index 0c28ea069449..f11ed46c79e4 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyPage.csv
@@ -25,13 +25,13 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 ,6,91,1,0,0,0,0,0,0,0,"Hotel #0",91,"pages",,0,,
-,7,91,513,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",,1,,
-,8,91,1,0,0,0,0,0,0,0,"Hotel #1",300,"tt_content",,2,,
-,9,91,2,0,0,0,0,0,0,0,"Hotel #2",300,"tt_content",,1,,
+,7,91,513,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
+,8,91,1,0,0,0,0,0,0,0,"Hotel #1",300,"tt_content",1nff.hotels,2,,
+,9,91,2,0,0,0,0,0,0,0,"Hotel #2",300,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyPageWHotelBeforeParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyPageWHotelBeforeParentContent.csv
index 3376067252f3..90a9ddd59923 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyPageWHotelBeforeParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyPageWHotelBeforeParentContent.csv
@@ -25,13 +25,13 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 ,6,91,1,0,0,0,0,0,0,0,"Hotel #0",91,"pages",,0,,
-,7,91,2,0,0,0,0,0,0,0,"Hotel #2",300,"tt_content",,1,,
-,8,91,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",,1,,
-,9,91,1,0,0,0,0,0,0,0,"Hotel #1",300,"tt_content",,2,,
+,7,91,2,0,0,0,0,0,0,0,"Hotel #2",300,"tt_content",1nff.hotels,1,,
+,8,91,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
+,9,91,1,0,0,0,0,0,0,0,"Hotel #1",300,"tt_content",1nff.hotels,2,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyParentContent.csv
index 70751b89aa5b..0bf85c412ad9 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyParentContent.csv
@@ -23,10 +23,10 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyParentContentToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyParentContentToDifferentPage.csv
index 725cb3a1a905..862c2c0a65c6 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyParentContentToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyParentContentToDifferentPage.csv
@@ -23,10 +23,10 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,90,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,90,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNCopyParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
index 490944901b4d..5f629bfc2546 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
@@ -24,11 +24,11 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",,1,,
-,7,89,1,0,0,0,0,0,0,0,"Hotel #1",300,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
+,7,89,1,0,0,0,0,0,0,0,"Hotel #1",300,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
index c00ee379faef..2c6605eb6101 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
@@ -25,11 +25,11 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",,1,,
-,7,89,1,0,1,6,0,0,0,0,"[Translate to Dansk:] Hotel #1",300,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
+,7,89,1,0,1,6,0,0,0,0,"[Translate to Dansk:] Hotel #1",300,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createParentContent.csv
index b268ae1b55e6..a6b3d6177766 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createParentContent.csv
@@ -23,9 +23,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",
 ,2,89,1,0,0,0,,0,0,0,0,"Hotel #0",89,"pages",,0,
-,3,89,1,0,0,0,,0,0,0,0,"Hotel #1",297,"tt_content",,2,
-,4,89,2,0,0,0,,0,0,0,0,"Hotel #2",297,"tt_content",,1,
-,5,89,1,0,0,0,,0,0,0,0,"Hotel #1",298,"tt_content",,1,
+,3,89,1,0,0,0,,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,
+,4,89,2,0,0,0,,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,
+,5,89,1,0,0,0,,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",
 ,5,89,1,0,0,0,,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createParentContentNHotelNOfferChildren.csv
index 54646eed2994..e071b16cf1ee 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createParentContentNHotelNOfferChildren.csv
@@ -23,10 +23,10 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/deletePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/deletePage.csv
index 07f328da3e6d..63c13a897e58 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/deletePage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/deletePage.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,1,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,1,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,1,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,1,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,1,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,1,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,1,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,1,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/deleteParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/deleteParentContent.csv
index 04f0cc988e5b..7db844229fe9 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/deleteParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/deleteParentContent.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,1,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,1,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/localizeParentContentWAllChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/localizeParentContentWAllChildren.csv
index bbb1ed32640a..7c80bb8c4e2a 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/localizeParentContentWAllChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/localizeParentContentWAllChildren.csv
@@ -24,10 +24,10 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,6,89,1,0,1,5,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,6,89,1,0,1,5,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyNDiscardNModifyParentWHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
index c410ede120e9..75a7ed50ed8d 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Testing #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Testing #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyOnlyHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyOnlyHotelChild.csv
index 950a13084cef..e60ecf687de0 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyOnlyHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyOnlyHotelChild.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Testing #1",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Testing #1",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyPage.csv
index 62d864b59a09..9222486d3c71 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyPage.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentContent.csv
index 9d8b12900974..36ebb54cdfe9 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentContent.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNAddHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNAddHotelChild.csv
index c78ef3cc662b..0b17ed989ea2 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNAddHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNAddHotelChild.csv
@@ -22,10 +22,10 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
-,7,89,2,0,0,0,0,0,0,0,"Hotel #2",298,"tt_content",,0,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,7,89,2,0,0,0,0,0,0,0,"Hotel #2",298,"tt_content",1nff.hotels,0,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNChangeHotelChildrenSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNChangeHotelChildrenSorting.csv
index 7c4d5c269700..535eb93e34bb 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNChangeHotelChildrenSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNChangeHotelChildrenSorting.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,2,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,1,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,2,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,1,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNDeleteHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNDeleteHotelChild.csv
index e39fcfb25710..3eb44caa1915 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNDeleteHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNDeleteHotelChild.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,1,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,1,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNHotelChild.csv
index 950a13084cef..e60ecf687de0 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNHotelChild.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Testing #1",297,"tt_content",,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Testing #1",297,"tt_content",1nff.hotels,1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPage.csv
index d21ba7865704..414a11178ffb 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPage.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,90,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,90,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPageNChangeSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
index dbe0ec7a2f8d..a312bcfcb6f0 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,90,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,90,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,90,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,90,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,90,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,90,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,90,2,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPageTwice.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPageTwice.csv
index 713be594d87f..4e3302a4a0ce 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPageTwice.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPageTwice.csv
@@ -22,9 +22,9 @@
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1,,
-,5,1,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
+,5,1,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
 "tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
 ,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-- 
GitLab