diff --git a/typo3/sysext/backend/Tests/Functional/Controller/Page/LocalizationControllerTest.php b/typo3/sysext/backend/Tests/Functional/Controller/Page/LocalizationControllerTest.php
index 93d494e82a733675c6b25cc6333d0401fe083af9..3f649e8c7d45ac1c53181b391ef1fce50b4a8d0b 100644
--- a/typo3/sysext/backend/Tests/Functional/Controller/Page/LocalizationControllerTest.php
+++ b/typo3/sysext/backend/Tests/Functional/Controller/Page/LocalizationControllerTest.php
@@ -42,6 +42,12 @@ class LocalizationControllerTest extends AbstractDataHandlerActionTestCase
*/
protected $backendUser;
+ /**
+ * @var bool
+ * @todo: Test setup should be updated to have true here
+ */
+ protected $assertCleanReferenceIndex = false;
+
/**
* @var array
*/
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/AbstractDataHandlerActionTestCase.php b/typo3/sysext/core/Tests/Functional/DataHandling/AbstractDataHandlerActionTestCase.php
index 152c4ab16db6694f519fa35c96a1e0f2514830bc..df138d7e8f61c08c2ea93e8d13c7263183ef9ab3 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/AbstractDataHandlerActionTestCase.php
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/AbstractDataHandlerActionTestCase.php
@@ -21,6 +21,7 @@ use TYPO3\CMS\Core\Context\Context;
use TYPO3\CMS\Core\Context\WorkspaceAspect;
use TYPO3\CMS\Core\Core\Bootstrap;
use TYPO3\CMS\Core\Database\Connection;
+use TYPO3\CMS\Core\Database\ReferenceIndex;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\TestingFramework\Core\Functional\Framework\Constraint\RequestSection\DoesNotHaveRecordConstraint;
use TYPO3\TestingFramework\Core\Functional\Framework\Constraint\RequestSection\HasRecordConstraint;
@@ -36,6 +37,11 @@ abstract class AbstractDataHandlerActionTestCase extends FunctionalTestCase
{
const VALUE_BackendUserId = 1;
+ /**
+ * @var bool True if assertCleanReferenceIndex() should be called in tearDown(). Set to false only with care.
+ */
+ protected $assertCleanReferenceIndex = true;
+
/**
* @var string
*/
@@ -129,6 +135,9 @@ abstract class AbstractDataHandlerActionTestCase extends FunctionalTestCase
protected function tearDown(): void
{
$this->assertErrorLogEntries();
+ if ($this->assertCleanReferenceIndex) {
+ $this->assertCleanReferenceIndex();
+ }
unset($this->actionService);
unset($this->recordIds);
parent::tearDown();
@@ -272,6 +281,18 @@ abstract class AbstractDataHandlerActionTestCase extends FunctionalTestCase
}
}
+ /**
+ * Similar to log entries, verify DataHandler tests end up with a clean reference index.
+ */
+ protected function assertCleanReferenceIndex(): void
+ {
+ $referenceIndex = GeneralUtility::makeInstance(ReferenceIndex::class);
+ $referenceIndexFixResult = $referenceIndex->updateIndex(true);
+ if (count($referenceIndexFixResult['errors']) > 0) {
+ self::fail('Reference index not clean. ' . LF . implode(LF, $referenceIndexFixResult['errors']));
+ }
+ }
+
/**
* @return HasRecordConstraint
*/
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 86ab8ea73b26d9233a92e29d260a7214464e5e55..dc84a9778d7bcf8ac79f0104a29e8f0eaeed0886 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/DataSet/LiveDefaultElements.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/DataSet/LiveDefaultElements.csv
@@ -23,3 +23,13 @@
,3,89,1,0,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,0,"Hotel #2",297,"tt_content",,0
,5,89,1,0,0,0,,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,0
+"sys_refindex",,,,,,,,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","ref_table","ref_uid","ref_string",,,,,,
+,"58b0861c2821b9aa8c036f51c9992938","sys_category",28,"items",,,,0,0,"tt_content",297,,,,,,,
+,"a902304805e24ea0d57feaeb08d5c898","sys_category",29,"items",,,,0,0,"tt_content",297,,,,,,,
+,"4cf35307d2ebd8521d82d598a9d6fb37","sys_category",29,"items",,,,1,0,"tt_content",298,,,,,,,
+,"a39d4a457c3043438f34193027cdb8dc","sys_category",30,"items",,,,0,0,"tt_content",298,,,,,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,"sys_category",28,,,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/HookTest.php b/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/HookTest.php
index e85c96ff6578eebc0ab1cb82165e0f0511e78396..ca7a437be4f07882cdc66b7db2fdbf6ffe6d9316 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/HookTest.php
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/HookTest.php
@@ -35,6 +35,11 @@ class HookTest extends AbstractDataHandlerActionTestCase
const FIELD_ContentHotel = 'tx_irretutorial_1nff_hotels';
const FIELD_Categories = 'categories';
+ /**
+ * @var bool Reference index testing is not relevant here
+ */
+ protected $assertCleanReferenceIndex = false;
+
/**
* @var HookFixture
*/
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/DataSet/LiveDefaultElements.csv b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/DataSet/LiveDefaultElements.csv
index 76003165869420625ed1a1143c8c30977a41f6b4..b4b1016c1f93deaf09988342c7529b107561bd68 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/DataSet/LiveDefaultElements.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/DataSet/LiveDefaultElements.csv
@@ -26,3 +26,20 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image",,,,,,,
,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,
,331,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,,
+"sys_refindex",,,,,,,,,,,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,,,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,,,,,,,
+,"b1315f6a325027205050c81764294b72","sys_file",1,"storage",,,,0,0,0,"sys_file_storage",1,,,,,,,,,
+,"10034d14de6b8c87aa0096de9d029498","sys_file",1,"metadata",,,,0,0,0,"sys_file_metadata",1,,,,,,,,,
+,"6588728f1c2f2069b4b781ab1d102fff","sys_file",21,"storage",,,,0,0,0,"sys_file_storage",1,,,,,,,,,
+,"ff0a9ca5f364b75bccb699b74d167c83","sys_file",21,"metadata",,,,0,0,0,"sys_file_metadata",21,,,,,,,,,
+,"557de1cd99f1b4d25f681d822c060598","sys_file_metadata",1,"file",,,,0,0,0,"sys_file",1,,,,,,,,,
+,"4821da930346696406e3ccf3ec22d999","sys_file_metadata",21,"file",,,,0,0,0,"sys_file",21,,,,,,,,,
+,"aa821da8cdc56afc736974735c9b1c1c","sys_file_reference",126,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,,
+,"8e50f38980afa6f4e84530b12f9cd0b3","sys_file_reference",127,"uid_local",,,,0,0,0,"sys_file",21,,,,,,,,,
+,"1f1d715dd5783cd50ecbda978e23dccb","sys_file_reference",128,"uid_local",,,,0,0,0,"sys_file",21,,,,,,,,,
+,"c08c2538c324b0a98b0957bc4bdf36ae","sys_file_reference",129,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,,
+,"a1f2ffdc6bf235cb5516c4bfdeec5552","tt_content",330,"image",,,,0,0,0,"sys_file_reference",127,,,,,,,,,
+,"fc208fc9d55a71b2faa9f4e4d4fa941d","tt_content",330,"image",,,,1,0,0,"sys_file_reference",126,,,,,,,,,
+,"48540de7710e3082f347bdd65ca340f2","tt_content",331,"image",,,,0,0,0,"sys_file_reference",128,,,,,,,,,
+,"ceaebd2148901a6d7b0a52c546aa5218","tt_content",331,"image",,,,1,0,0,"sys_file_reference",129,,,,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/ActionTest.php b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/ActionTest.php
index ebb6d477a419c460367055bd4a8d798348bd4535..443ee96181c0d085e0ad174ca892a805913047b5 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/ActionTest.php
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/ActionTest.php
@@ -28,8 +28,13 @@ class ActionTest extends AbstractActionTestCase
protected $assertionDataSetDirectory = 'typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/';
/**
- * Content records
+ * @test
*/
+ public function verifyCleanReferenceIndex()
+ {
+ // The test verifies the imported data set has a clean reference index by the check in tearDown()
+ self::assertTrue(true);
+ }
/**
* @test
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/changeContentSorting.csv b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/changeContentSorting.csv
index 710cbc4ee8018b3eac9b420facb0d372f55f713c..4b6eede0a0cc8c82fb84d27afe08974b9ce81e75 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/changeContentSorting.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/changeContentSorting.csv
@@ -9,4 +9,19 @@
,330,89,768,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,
,331,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,
"sys_refindex",,,,,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,,,,,,
+,"b1315f6a325027205050c81764294b72","sys_file",1,"storage",,,,0,0,0,"sys_file_storage",1,,,,,,,,
+,"10034d14de6b8c87aa0096de9d029498","sys_file",1,"metadata",,,,0,0,0,"sys_file_metadata",1,,,,,,,,
+,"6588728f1c2f2069b4b781ab1d102fff","sys_file",21,"storage",,,,0,0,0,"sys_file_storage",1,,,,,,,,
+,"ff0a9ca5f364b75bccb699b74d167c83","sys_file",21,"metadata",,,,0,0,0,"sys_file_metadata",21,,,,,,,,
+,"557de1cd99f1b4d25f681d822c060598","sys_file_metadata",1,"file",,,,0,0,0,"sys_file",1,,,,,,,,
+,"4821da930346696406e3ccf3ec22d999","sys_file_metadata",21,"file",,,,0,0,0,"sys_file",21,,,,,,,,
+,"aa821da8cdc56afc736974735c9b1c1c","sys_file_reference",126,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,
+,"8e50f38980afa6f4e84530b12f9cd0b3","sys_file_reference",127,"uid_local",,,,0,0,0,"sys_file",21,,,,,,,,
+,"1f1d715dd5783cd50ecbda978e23dccb","sys_file_reference",128,"uid_local",,,,0,0,0,"sys_file",21,,,,,,,,
+,"c08c2538c324b0a98b0957bc4bdf36ae","sys_file_reference",129,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,
+,"a1f2ffdc6bf235cb5516c4bfdeec5552","tt_content",330,"image",,,,0,0,0,"sys_file_reference",127,,,,,,,,
+,"fc208fc9d55a71b2faa9f4e4d4fa941d","tt_content",330,"image",,,,1,0,0,"sys_file_reference",126,,,,,,,,
+,"48540de7710e3082f347bdd65ca340f2","tt_content",331,"image",,,,0,0,0,"sys_file_reference",128,,,,,,,,
+,"ceaebd2148901a6d7b0a52c546aa5218","tt_content",331,"image",,,,1,0,0,"sys_file_reference",129,,,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/copyContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/copyContent.csv
index eb4676d5b7caf1aa750e21672baa36ec29ca6d1d..71e27a8475cb07269e1e2094c6914a13e7963a35 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/copyContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/copyContent.csv
@@ -12,8 +12,23 @@
,331,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,
,332,89,128,0,0,0,331,0,0,0,0,0,"Regular Element #2 (copy 1)",2,,,,,,
"sys_refindex",,,,,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,,,,
-,"737779e2835b33067cc6141faf19343e","sys_file_reference",130,"uid_local",0,0,0,"sys_file",21,,,,,,,,,,,
-,"0e374e0da126c39774d168d96b06c743","sys_file_reference",131,"uid_local",0,0,0,"sys_file",1,,,,,,,,,,,
-,"7f0edf5e6a8704b7825f934cf264f3d6","tt_content",332,"image",0,0,0,"sys_file_reference",130,,,,,,,,,,,
-,"31407683c75d7b3e898921c4c0299c94","tt_content",332,"image",1,0,0,"sys_file_reference",131,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,,,,,,
+,"b1315f6a325027205050c81764294b72","sys_file",1,"storage",,,,0,0,0,"sys_file_storage",1,,,,,,,,
+,"10034d14de6b8c87aa0096de9d029498","sys_file",1,"metadata",,,,0,0,0,"sys_file_metadata",1,,,,,,,,
+,"6588728f1c2f2069b4b781ab1d102fff","sys_file",21,"storage",,,,0,0,0,"sys_file_storage",1,,,,,,,,
+,"ff0a9ca5f364b75bccb699b74d167c83","sys_file",21,"metadata",,,,0,0,0,"sys_file_metadata",21,,,,,,,,
+,"557de1cd99f1b4d25f681d822c060598","sys_file_metadata",1,"file",,,,0,0,0,"sys_file",1,,,,,,,,
+,"4821da930346696406e3ccf3ec22d999","sys_file_metadata",21,"file",,,,0,0,0,"sys_file",21,,,,,,,,
+,"aa821da8cdc56afc736974735c9b1c1c","sys_file_reference",126,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,
+,"8e50f38980afa6f4e84530b12f9cd0b3","sys_file_reference",127,"uid_local",,,,0,0,0,"sys_file",21,,,,,,,,
+,"1f1d715dd5783cd50ecbda978e23dccb","sys_file_reference",128,"uid_local",,,,0,0,0,"sys_file",21,,,,,,,,
+,"c08c2538c324b0a98b0957bc4bdf36ae","sys_file_reference",129,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,
+,"a1f2ffdc6bf235cb5516c4bfdeec5552","tt_content",330,"image",,,,0,0,0,"sys_file_reference",127,,,,,,,,
+,"fc208fc9d55a71b2faa9f4e4d4fa941d","tt_content",330,"image",,,,1,0,0,"sys_file_reference",126,,,,,,,,
+,"48540de7710e3082f347bdd65ca340f2","tt_content",331,"image",,,,0,0,0,"sys_file_reference",128,,,,,,,,
+,"ceaebd2148901a6d7b0a52c546aa5218","tt_content",331,"image",,,,1,0,0,"sys_file_reference",129,,,,,,,,
+,"737779e2835b33067cc6141faf19343e","sys_file_reference",130,"uid_local",,,,0,0,0,"sys_file",21,,,,,,,,
+,"0e374e0da126c39774d168d96b06c743","sys_file_reference",131,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,
+,"7f0edf5e6a8704b7825f934cf264f3d6","tt_content",332,"image",,,,0,0,0,"sys_file_reference",130,,,,,,,,
+,"31407683c75d7b3e898921c4c0299c94","tt_content",332,"image",,,,1,0,0,"sys_file_reference",131,,,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/copyContentToLanguage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/copyContentToLanguage.csv
index dec88177230a6d8e184fa12e1aff5498e35ab9a0..3ea0dec427df4562ac3c69416bbf5bca58ff055a 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/copyContentToLanguage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/copyContentToLanguage.csv
@@ -12,12 +12,27 @@
,331,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,
,332,89,768,0,1,0,331,0,0,0,0,0,"[Translate to Dansk:] Regular Element #2",2,,,,,,
"sys_refindex",,,,,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,,,,
-,"4f4fdde6552680fd5684bbd5d92f2198","sys_file_reference",130,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,,,,
-,"737779e2835b33067cc6141faf19343e","sys_file_reference",130,"uid_local",0,0,0,"sys_file",21,,,,,,,,,,,
-,"3d53621a249a485eb64789618248319d","sys_file_reference",131,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,,,,
-,"0e374e0da126c39774d168d96b06c743","sys_file_reference",131,"uid_local",0,0,0,"sys_file",1,,,,,,,,,,,
-,"7f0edf5e6a8704b7825f934cf264f3d6","tt_content",332,"image",0,0,0,"sys_file_reference",130,,,,,,,,,,,
-,"31407683c75d7b3e898921c4c0299c94","tt_content",332,"image",1,0,0,"sys_file_reference",131,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,,,,,,
+,"b1315f6a325027205050c81764294b72","sys_file",1,"storage",,,,0,0,0,"sys_file_storage",1,,,,,,,,
+,"10034d14de6b8c87aa0096de9d029498","sys_file",1,"metadata",,,,0,0,0,"sys_file_metadata",1,,,,,,,,
+,"6588728f1c2f2069b4b781ab1d102fff","sys_file",21,"storage",,,,0,0,0,"sys_file_storage",1,,,,,,,,
+,"ff0a9ca5f364b75bccb699b74d167c83","sys_file",21,"metadata",,,,0,0,0,"sys_file_metadata",21,,,,,,,,
+,"557de1cd99f1b4d25f681d822c060598","sys_file_metadata",1,"file",,,,0,0,0,"sys_file",1,,,,,,,,
+,"4821da930346696406e3ccf3ec22d999","sys_file_metadata",21,"file",,,,0,0,0,"sys_file",21,,,,,,,,
+,"aa821da8cdc56afc736974735c9b1c1c","sys_file_reference",126,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,
+,"8e50f38980afa6f4e84530b12f9cd0b3","sys_file_reference",127,"uid_local",,,,0,0,0,"sys_file",21,,,,,,,,
+,"1f1d715dd5783cd50ecbda978e23dccb","sys_file_reference",128,"uid_local",,,,0,0,0,"sys_file",21,,,,,,,,
+,"c08c2538c324b0a98b0957bc4bdf36ae","sys_file_reference",129,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,
+,"a1f2ffdc6bf235cb5516c4bfdeec5552","tt_content",330,"image",,,,0,0,0,"sys_file_reference",127,,,,,,,,
+,"fc208fc9d55a71b2faa9f4e4d4fa941d","tt_content",330,"image",,,,1,0,0,"sys_file_reference",126,,,,,,,,
+,"48540de7710e3082f347bdd65ca340f2","tt_content",331,"image",,,,0,0,0,"sys_file_reference",128,,,,,,,,
+,"ceaebd2148901a6d7b0a52c546aa5218","tt_content",331,"image",,,,1,0,0,"sys_file_reference",129,,,,,,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,,,,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,,,
+,"4f4fdde6552680fd5684bbd5d92f2198","sys_file_reference",130,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,,,
+,"737779e2835b33067cc6141faf19343e","sys_file_reference",130,"uid_local",,,,0,0,0,"sys_file",21,,,,,,,,
+,"3d53621a249a485eb64789618248319d","sys_file_reference",131,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,,,
+,"0e374e0da126c39774d168d96b06c743","sys_file_reference",131,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,
+,"7f0edf5e6a8704b7825f934cf264f3d6","tt_content",332,"image",,,,0,0,0,"sys_file_reference",130,,,,,,,,
+,"31407683c75d7b3e898921c4c0299c94","tt_content",332,"image",,,,1,0,0,"sys_file_reference",131,,,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/createContentWFileReference.csv b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/createContentWFileReference.csv
index de700305fb9ccbd1134218129f17a87b28f2bfa7..399b98bd535e01c6d4e93c37a7bc1177d90e8273 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/createContentWFileReference.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/createContentWFileReference.csv
@@ -11,6 +11,21 @@
,331,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,
,332,89,128,0,0,0,0,0,0,0,0,0,"Testing #1",1,,,,,,
"sys_refindex",,,,,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,,,,
-,"bb218c2fe53f7e399a6677966d9e24ab","sys_file_reference",130,"uid_local",0,0,0,"sys_file",1,,,,,,,,,,,
-,"7f0edf5e6a8704b7825f934cf264f3d6","tt_content",332,"image",0,0,0,"sys_file_reference",130,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,,,,,,
+,"b1315f6a325027205050c81764294b72","sys_file",1,"storage",,,,0,0,0,"sys_file_storage",1,,,,,,,,
+,"10034d14de6b8c87aa0096de9d029498","sys_file",1,"metadata",,,,0,0,0,"sys_file_metadata",1,,,,,,,,
+,"6588728f1c2f2069b4b781ab1d102fff","sys_file",21,"storage",,,,0,0,0,"sys_file_storage",1,,,,,,,,
+,"ff0a9ca5f364b75bccb699b74d167c83","sys_file",21,"metadata",,,,0,0,0,"sys_file_metadata",21,,,,,,,,
+,"557de1cd99f1b4d25f681d822c060598","sys_file_metadata",1,"file",,,,0,0,0,"sys_file",1,,,,,,,,
+,"4821da930346696406e3ccf3ec22d999","sys_file_metadata",21,"file",,,,0,0,0,"sys_file",21,,,,,,,,
+,"aa821da8cdc56afc736974735c9b1c1c","sys_file_reference",126,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,
+,"8e50f38980afa6f4e84530b12f9cd0b3","sys_file_reference",127,"uid_local",,,,0,0,0,"sys_file",21,,,,,,,,
+,"1f1d715dd5783cd50ecbda978e23dccb","sys_file_reference",128,"uid_local",,,,0,0,0,"sys_file",21,,,,,,,,
+,"c08c2538c324b0a98b0957bc4bdf36ae","sys_file_reference",129,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,
+,"a1f2ffdc6bf235cb5516c4bfdeec5552","tt_content",330,"image",,,,0,0,0,"sys_file_reference",127,,,,,,,,
+,"fc208fc9d55a71b2faa9f4e4d4fa941d","tt_content",330,"image",,,,1,0,0,"sys_file_reference",126,,,,,,,,
+,"48540de7710e3082f347bdd65ca340f2","tt_content",331,"image",,,,0,0,0,"sys_file_reference",128,,,,,,,,
+,"ceaebd2148901a6d7b0a52c546aa5218","tt_content",331,"image",,,,1,0,0,"sys_file_reference",129,,,,,,,,
+,"7f0edf5e6a8704b7825f934cf264f3d6","tt_content",332,"image",,,,0,0,0,"sys_file_reference",130,,,,,,,,
+,"bb218c2fe53f7e399a6677966d9e24ab","sys_file_reference",130,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/createContentWFileReferenceNDeleteFileReference.csv b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/createContentWFileReferenceNDeleteFileReference.csv
index 364350063b3f96733e3bdda95ba2eb37ae92124b..35bd56893deda59d6203449c52a4696968a4c56a 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/createContentWFileReferenceNDeleteFileReference.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/createContentWFileReferenceNDeleteFileReference.csv
@@ -11,7 +11,20 @@
,331,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,,
,332,89,128,0,0,0,0,0,0,0,0,"Testing #1",0,,,,,,,
"sys_refindex",,,,,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,,,,
-,"b1315f6a325027205050c81764294b72","sys_file",1,"storage",0,0,0,"sys_file_storage",1,,,,,,,,,,,
-,"10034d14de6b8c87aa0096de9d029498","sys_file",1,"metadata",0,0,0,"sys_file_metadata",1,,,,,,,,,,,
-,"788fed77d153954bc5cfd013f123e444","sys_file_reference",130,"uid_local",0,1,0,"sys_file",1,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,,,,,,
+,"b1315f6a325027205050c81764294b72","sys_file",1,"storage",,,,0,0,0,"sys_file_storage",1,,,,,,,,
+,"10034d14de6b8c87aa0096de9d029498","sys_file",1,"metadata",,,,0,0,0,"sys_file_metadata",1,,,,,,,,
+,"6588728f1c2f2069b4b781ab1d102fff","sys_file",21,"storage",,,,0,0,0,"sys_file_storage",1,,,,,,,,
+,"ff0a9ca5f364b75bccb699b74d167c83","sys_file",21,"metadata",,,,0,0,0,"sys_file_metadata",21,,,,,,,,
+,"557de1cd99f1b4d25f681d822c060598","sys_file_metadata",1,"file",,,,0,0,0,"sys_file",1,,,,,,,,
+,"4821da930346696406e3ccf3ec22d999","sys_file_metadata",21,"file",,,,0,0,0,"sys_file",21,,,,,,,,
+,"aa821da8cdc56afc736974735c9b1c1c","sys_file_reference",126,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,
+,"8e50f38980afa6f4e84530b12f9cd0b3","sys_file_reference",127,"uid_local",,,,0,0,0,"sys_file",21,,,,,,,,
+,"1f1d715dd5783cd50ecbda978e23dccb","sys_file_reference",128,"uid_local",,,,0,0,0,"sys_file",21,,,,,,,,
+,"c08c2538c324b0a98b0957bc4bdf36ae","sys_file_reference",129,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,
+,"a1f2ffdc6bf235cb5516c4bfdeec5552","tt_content",330,"image",,,,0,0,0,"sys_file_reference",127,,,,,,,,
+,"fc208fc9d55a71b2faa9f4e4d4fa941d","tt_content",330,"image",,,,1,0,0,"sys_file_reference",126,,,,,,,,
+,"48540de7710e3082f347bdd65ca340f2","tt_content",331,"image",,,,0,0,0,"sys_file_reference",128,,,,,,,,
+,"ceaebd2148901a6d7b0a52c546aa5218","tt_content",331,"image",,,,1,0,0,"sys_file_reference",129,,,,,,,,
+,"788fed77d153954bc5cfd013f123e444","sys_file_reference",130,"uid_local",,,,0,1,0,"sys_file",1,,,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/deleteContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/deleteContent.csv
index 42f1d8e49e0874e538f42cdb24965c352dc80280..a6242ca67bb0a3617acd3cb104e672c3c81f45a4 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/deleteContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/deleteContent.csv
@@ -9,10 +9,17 @@
,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,
,331,89,512,1,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,
"sys_refindex",,,,,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,,,,
-,"0b7edf2205371519698cdfbf6e0cc6e7","sys_file_reference",128,"uid_local",0,1,0,"sys_file",21,,,,,,,,,,,
-,"6588728f1c2f2069b4b781ab1d102fff","sys_file",21,"storage",0,0,0,"sys_file_storage",1,,,,,,,,,,,
-,"ff0a9ca5f364b75bccb699b74d167c83","sys_file",21,"metadata",0,0,0,"sys_file_metadata",21,,,,,,,,,,,
-,"fb266d0b94cee39b87fe03b9b7875c25","sys_file_reference",129,"uid_local",0,1,0,"sys_file",1,,,,,,,,,,,
-,"b1315f6a325027205050c81764294b72","sys_file",1,"storage",0,0,0,"sys_file_storage",1,,,,,,,,,,,
-,"10034d14de6b8c87aa0096de9d029498","sys_file",1,"metadata",0,0,0,"sys_file_metadata",1,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,,,,,,
+,"b1315f6a325027205050c81764294b72","sys_file",1,"storage",,,,0,0,0,"sys_file_storage",1,,,,,,,,
+,"10034d14de6b8c87aa0096de9d029498","sys_file",1,"metadata",,,,0,0,0,"sys_file_metadata",1,,,,,,,,
+,"6588728f1c2f2069b4b781ab1d102fff","sys_file",21,"storage",,,,0,0,0,"sys_file_storage",1,,,,,,,,
+,"ff0a9ca5f364b75bccb699b74d167c83","sys_file",21,"metadata",,,,0,0,0,"sys_file_metadata",21,,,,,,,,
+,"557de1cd99f1b4d25f681d822c060598","sys_file_metadata",1,"file",,,,0,0,0,"sys_file",1,,,,,,,,
+,"4821da930346696406e3ccf3ec22d999","sys_file_metadata",21,"file",,,,0,0,0,"sys_file",21,,,,,,,,
+,"aa821da8cdc56afc736974735c9b1c1c","sys_file_reference",126,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,
+,"8e50f38980afa6f4e84530b12f9cd0b3","sys_file_reference",127,"uid_local",,,,0,0,0,"sys_file",21,,,,,,,,
+,"a1f2ffdc6bf235cb5516c4bfdeec5552","tt_content",330,"image",,,,0,0,0,"sys_file_reference",127,,,,,,,,
+,"fc208fc9d55a71b2faa9f4e4d4fa941d","tt_content",330,"image",,,,1,0,0,"sys_file_reference",126,,,,,,,,
+,"0b7edf2205371519698cdfbf6e0cc6e7","sys_file_reference",128,"uid_local",,,,0,1,0,"sys_file",21,,,,,,,,
+,"fb266d0b94cee39b87fe03b9b7875c25","sys_file_reference",129,"uid_local",,,,0,1,0,"sys_file",1,,,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/localizeContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/localizeContent.csv
index 295ff12bae2a1233f618d23bddf7cc12ce31c627..7beb1c5d8de208f0073531d162658afff553c10f 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/localizeContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/localizeContent.csv
@@ -12,15 +12,30 @@
,331,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,,
,332,89,768,0,1,331,331,0,0,0,0,0,"[Translate to Dansk:] Regular Element #2",2,,,,,,,
"sys_refindex",,,,,,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,,,,,
-,"4f4fdde6552680fd5684bbd5d92f2198","sys_file_reference",130,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,,,,,
-,"737779e2835b33067cc6141faf19343e","sys_file_reference",130,"uid_local",0,0,0,"sys_file",21,,,,,,,,,,,,
-,"3d53621a249a485eb64789618248319d","sys_file_reference",131,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,,,,,
-,"0e374e0da126c39774d168d96b06c743","sys_file_reference",131,"uid_local",0,0,0,"sys_file",1,,,,,,,,,,,,
-,"7f0edf5e6a8704b7825f934cf264f3d6","tt_content",332,"image",0,0,0,"sys_file_reference",130,,,,,,,,,,,,
-,"31407683c75d7b3e898921c4c0299c94","tt_content",332,"image",1,0,0,"sys_file_reference",131,,,,,,,,,,,,
-,"6492359bfdddb087a1767142afaf6d66","sys_file_reference",130,"l10n_parent",0,0,0,"sys_file_reference",128,,,,,,,,,,,,
-,"f5bd16e70513c4550a3eb4853eec06d3","sys_file_reference",131,"l10n_parent",0,0,0,"sys_file_reference",129,,,,,,,,,,,,
-,"044c9d0eb716da909fe54ad9f866d53b","tt_content",332,"l18n_parent",0,0,0,"tt_content",331,,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,,,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,,,,,,,
+,"b1315f6a325027205050c81764294b72","sys_file",1,"storage",,,,0,0,0,"sys_file_storage",1,,,,,,,,,
+,"10034d14de6b8c87aa0096de9d029498","sys_file",1,"metadata",,,,0,0,0,"sys_file_metadata",1,,,,,,,,,
+,"6588728f1c2f2069b4b781ab1d102fff","sys_file",21,"storage",,,,0,0,0,"sys_file_storage",1,,,,,,,,,
+,"ff0a9ca5f364b75bccb699b74d167c83","sys_file",21,"metadata",,,,0,0,0,"sys_file_metadata",21,,,,,,,,,
+,"557de1cd99f1b4d25f681d822c060598","sys_file_metadata",1,"file",,,,0,0,0,"sys_file",1,,,,,,,,,
+,"4821da930346696406e3ccf3ec22d999","sys_file_metadata",21,"file",,,,0,0,0,"sys_file",21,,,,,,,,,
+,"aa821da8cdc56afc736974735c9b1c1c","sys_file_reference",126,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,,
+,"8e50f38980afa6f4e84530b12f9cd0b3","sys_file_reference",127,"uid_local",,,,0,0,0,"sys_file",21,,,,,,,,,
+,"1f1d715dd5783cd50ecbda978e23dccb","sys_file_reference",128,"uid_local",,,,0,0,0,"sys_file",21,,,,,,,,,
+,"c08c2538c324b0a98b0957bc4bdf36ae","sys_file_reference",129,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,,
+,"a1f2ffdc6bf235cb5516c4bfdeec5552","tt_content",330,"image",,,,0,0,0,"sys_file_reference",127,,,,,,,,,
+,"fc208fc9d55a71b2faa9f4e4d4fa941d","tt_content",330,"image",,,,1,0,0,"sys_file_reference",126,,,,,,,,,
+,"48540de7710e3082f347bdd65ca340f2","tt_content",331,"image",,,,0,0,0,"sys_file_reference",128,,,,,,,,,
+,"ceaebd2148901a6d7b0a52c546aa5218","tt_content",331,"image",,,,1,0,0,"sys_file_reference",129,,,,,,,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,,,,,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,,,,
+,"4f4fdde6552680fd5684bbd5d92f2198","sys_file_reference",130,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,,,,
+,"6492359bfdddb087a1767142afaf6d66","sys_file_reference",130,"l10n_parent",,,,0,0,0,"sys_file_reference",128,,,,,,,,,
+,"737779e2835b33067cc6141faf19343e","sys_file_reference",130,"uid_local",,,,0,0,0,"sys_file",21,,,,,,,,,
+,"3d53621a249a485eb64789618248319d","sys_file_reference",131,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,,,,
+,"f5bd16e70513c4550a3eb4853eec06d3","sys_file_reference",131,"l10n_parent",,,,0,0,0,"sys_file_reference",129,,,,,,,,,
+,"0e374e0da126c39774d168d96b06c743","sys_file_reference",131,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,,
+,"044c9d0eb716da909fe54ad9f866d53b","tt_content",332,"l18n_parent",,,,0,0,0,"tt_content",331,,,,,,,,,
+,"7f0edf5e6a8704b7825f934cf264f3d6","tt_content",332,"image",,,,0,0,0,"sys_file_reference",130,,,,,,,,,
+,"31407683c75d7b3e898921c4c0299c94","tt_content",332,"image",,,,1,0,0,"sys_file_reference",131,,,,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContent.csv
index edb1fc4c24976e30063036d9ea8052bd74629077..a98bdcda550bfcd2c877ea32a0a23acc53d768a2 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContent.csv
@@ -9,6 +9,19 @@
,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,
,331,89,512,0,0,0,0,0,0,0,0,0,"Testing #1",2,,,,,,
"sys_refindex",,,,,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,,,,
-,"48540de7710e3082f347bdd65ca340f2","tt_content",331,"image",0,0,0,"sys_file_reference",128,,,,,,,,,,,
-,"ceaebd2148901a6d7b0a52c546aa5218","tt_content",331,"image",1,0,0,"sys_file_reference",129,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,,,,,,
+,"b1315f6a325027205050c81764294b72","sys_file",1,"storage",,,,0,0,0,"sys_file_storage",1,,,,,,,,
+,"10034d14de6b8c87aa0096de9d029498","sys_file",1,"metadata",,,,0,0,0,"sys_file_metadata",1,,,,,,,,
+,"6588728f1c2f2069b4b781ab1d102fff","sys_file",21,"storage",,,,0,0,0,"sys_file_storage",1,,,,,,,,
+,"ff0a9ca5f364b75bccb699b74d167c83","sys_file",21,"metadata",,,,0,0,0,"sys_file_metadata",21,,,,,,,,
+,"557de1cd99f1b4d25f681d822c060598","sys_file_metadata",1,"file",,,,0,0,0,"sys_file",1,,,,,,,,
+,"4821da930346696406e3ccf3ec22d999","sys_file_metadata",21,"file",,,,0,0,0,"sys_file",21,,,,,,,,
+,"aa821da8cdc56afc736974735c9b1c1c","sys_file_reference",126,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,
+,"8e50f38980afa6f4e84530b12f9cd0b3","sys_file_reference",127,"uid_local",,,,0,0,0,"sys_file",21,,,,,,,,
+,"1f1d715dd5783cd50ecbda978e23dccb","sys_file_reference",128,"uid_local",,,,0,0,0,"sys_file",21,,,,,,,,
+,"c08c2538c324b0a98b0957bc4bdf36ae","sys_file_reference",129,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,
+,"a1f2ffdc6bf235cb5516c4bfdeec5552","tt_content",330,"image",,,,0,0,0,"sys_file_reference",127,,,,,,,,
+,"fc208fc9d55a71b2faa9f4e4d4fa941d","tt_content",330,"image",,,,1,0,0,"sys_file_reference",126,,,,,,,,
+,"48540de7710e3082f347bdd65ca340f2","tt_content",331,"image",,,,0,0,0,"sys_file_reference",128,,,,,,,,
+,"ceaebd2148901a6d7b0a52c546aa5218","tt_content",331,"image",,,,1,0,0,"sys_file_reference",129,,,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNAddFileReference.csv b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNAddFileReference.csv
index 0e3a0eb76d2e37c28aebd97ba841f9bcc276ed7f..83dd108a6979d92ce754721bf132c580b4459a29 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNAddFileReference.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNAddFileReference.csv
@@ -10,10 +10,21 @@
,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,
,331,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",3,,,,,,
"sys_refindex",,,,,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,,,,
-,"48540de7710e3082f347bdd65ca340f2","tt_content",331,"image",0,0,0,"sys_file_reference",128,,,,,,,,,,,
-,"ceaebd2148901a6d7b0a52c546aa5218","tt_content",331,"image",1,0,0,"sys_file_reference",129,,,,,,,,,,,
-,"bb218c2fe53f7e399a6677966d9e24ab","sys_file_reference",130,"uid_local",0,0,0,"sys_file",1,,,,,,,,,,,
-,"1f1d715dd5783cd50ecbda978e23dccb","sys_file_reference",128,"uid_local",0,0,0,"sys_file",21,,,,,,,,,,,
-,"c08c2538c324b0a98b0957bc4bdf36ae","sys_file_reference",129,"uid_local",0,0,0,"sys_file",1,,,,,,,,,,,
-,"64e03eaeb86766c9faa6cabe177b42a9","tt_content",331,"image",2,0,0,"sys_file_reference",130,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,,,,,,
+,"b1315f6a325027205050c81764294b72","sys_file",1,"storage",,,,0,0,0,"sys_file_storage",1,,,,,,,,
+,"10034d14de6b8c87aa0096de9d029498","sys_file",1,"metadata",,,,0,0,0,"sys_file_metadata",1,,,,,,,,
+,"6588728f1c2f2069b4b781ab1d102fff","sys_file",21,"storage",,,,0,0,0,"sys_file_storage",1,,,,,,,,
+,"ff0a9ca5f364b75bccb699b74d167c83","sys_file",21,"metadata",,,,0,0,0,"sys_file_metadata",21,,,,,,,,
+,"557de1cd99f1b4d25f681d822c060598","sys_file_metadata",1,"file",,,,0,0,0,"sys_file",1,,,,,,,,
+,"4821da930346696406e3ccf3ec22d999","sys_file_metadata",21,"file",,,,0,0,0,"sys_file",21,,,,,,,,
+,"aa821da8cdc56afc736974735c9b1c1c","sys_file_reference",126,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,
+,"8e50f38980afa6f4e84530b12f9cd0b3","sys_file_reference",127,"uid_local",,,,0,0,0,"sys_file",21,,,,,,,,
+,"1f1d715dd5783cd50ecbda978e23dccb","sys_file_reference",128,"uid_local",,,,0,0,0,"sys_file",21,,,,,,,,
+,"c08c2538c324b0a98b0957bc4bdf36ae","sys_file_reference",129,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,
+,"a1f2ffdc6bf235cb5516c4bfdeec5552","tt_content",330,"image",,,,0,0,0,"sys_file_reference",127,,,,,,,,
+,"fc208fc9d55a71b2faa9f4e4d4fa941d","tt_content",330,"image",,,,1,0,0,"sys_file_reference",126,,,,,,,,
+,"48540de7710e3082f347bdd65ca340f2","tt_content",331,"image",,,,0,0,0,"sys_file_reference",128,,,,,,,,
+,"ceaebd2148901a6d7b0a52c546aa5218","tt_content",331,"image",,,,1,0,0,"sys_file_reference",129,,,,,,,,
+,"64e03eaeb86766c9faa6cabe177b42a9","tt_content",331,"image",,,,2,0,0,"sys_file_reference",130,,,,,,,,
+,"bb218c2fe53f7e399a6677966d9e24ab","sys_file_reference",130,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteAllFileReference.csv b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteAllFileReference.csv
index c7bd75d6427af1fa3c4a040587767f021fb39340..b0d276dd9f7a17fb714137503e86fc8e60660ccf 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteAllFileReference.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteAllFileReference.csv
@@ -9,10 +9,17 @@
,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,
,331,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",0,,,,,,
"sys_refindex",,,,,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,,,,
-,"fb266d0b94cee39b87fe03b9b7875c25","sys_file_reference",129,"uid_local",0,1,0,"sys_file",1,,,,,,,,,,,
-,"b1315f6a325027205050c81764294b72","sys_file",1,"storage",0,0,0,"sys_file_storage",1,,,,,,,,,,,
-,"10034d14de6b8c87aa0096de9d029498","sys_file",1,"metadata",0,0,0,"sys_file_metadata",1,,,,,,,,,,,
-,"0b7edf2205371519698cdfbf6e0cc6e7","sys_file_reference",128,"uid_local",0,1,0,"sys_file",21,,,,,,,,,,,
-,"6588728f1c2f2069b4b781ab1d102fff","sys_file",21,"storage",0,0,0,"sys_file_storage",1,,,,,,,,,,,
-,"ff0a9ca5f364b75bccb699b74d167c83","sys_file",21,"metadata",0,0,0,"sys_file_metadata",21,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,,,,,,
+,"b1315f6a325027205050c81764294b72","sys_file",1,"storage",,,,0,0,0,"sys_file_storage",1,,,,,,,,
+,"10034d14de6b8c87aa0096de9d029498","sys_file",1,"metadata",,,,0,0,0,"sys_file_metadata",1,,,,,,,,
+,"6588728f1c2f2069b4b781ab1d102fff","sys_file",21,"storage",,,,0,0,0,"sys_file_storage",1,,,,,,,,
+,"ff0a9ca5f364b75bccb699b74d167c83","sys_file",21,"metadata",,,,0,0,0,"sys_file_metadata",21,,,,,,,,
+,"557de1cd99f1b4d25f681d822c060598","sys_file_metadata",1,"file",,,,0,0,0,"sys_file",1,,,,,,,,
+,"4821da930346696406e3ccf3ec22d999","sys_file_metadata",21,"file",,,,0,0,0,"sys_file",21,,,,,,,,
+,"aa821da8cdc56afc736974735c9b1c1c","sys_file_reference",126,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,
+,"8e50f38980afa6f4e84530b12f9cd0b3","sys_file_reference",127,"uid_local",,,,0,0,0,"sys_file",21,,,,,,,,
+,"a1f2ffdc6bf235cb5516c4bfdeec5552","tt_content",330,"image",,,,0,0,0,"sys_file_reference",127,,,,,,,,
+,"fc208fc9d55a71b2faa9f4e4d4fa941d","tt_content",330,"image",,,,1,0,0,"sys_file_reference",126,,,,,,,,
+,"fb266d0b94cee39b87fe03b9b7875c25","sys_file_reference",129,"uid_local",,,,0,1,0,"sys_file",1,,,,,,,,
+,"0b7edf2205371519698cdfbf6e0cc6e7","sys_file_reference",128,"uid_local",,,,0,1,0,"sys_file",21,,,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteFileReference.csv b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteFileReference.csv
index b11efab0644b7e4d7a611475b31ac28ee1eaeee2..dd4e9febe6d3c5b8ab3e3d17ea173730082def8a 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteFileReference.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteFileReference.csv
@@ -9,9 +9,18 @@
,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,
,331,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,,
"sys_refindex",,,,,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,,,,
-,"c08c2538c324b0a98b0957bc4bdf36ae","sys_file_reference",129,"uid_local",0,0,0,"sys_file",1,,,,,,,,,,,
-,"997297edc2047a0fd48ffc237299a902","tt_content",331,"image",0,0,0,"sys_file_reference",129,,,,,,,,,,,
-,"0b7edf2205371519698cdfbf6e0cc6e7","sys_file_reference",128,"uid_local",0,1,0,"sys_file",21,,,,,,,,,,,
-,"6588728f1c2f2069b4b781ab1d102fff","sys_file",21,"storage",0,0,0,"sys_file_storage",1,,,,,,,,,,,
-,"ff0a9ca5f364b75bccb699b74d167c83","sys_file",21,"metadata",0,0,0,"sys_file_metadata",21,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,,,,,,
+,"b1315f6a325027205050c81764294b72","sys_file",1,"storage",,,,0,0,0,"sys_file_storage",1,,,,,,,,
+,"10034d14de6b8c87aa0096de9d029498","sys_file",1,"metadata",,,,0,0,0,"sys_file_metadata",1,,,,,,,,
+,"6588728f1c2f2069b4b781ab1d102fff","sys_file",21,"storage",,,,0,0,0,"sys_file_storage",1,,,,,,,,
+,"ff0a9ca5f364b75bccb699b74d167c83","sys_file",21,"metadata",,,,0,0,0,"sys_file_metadata",21,,,,,,,,
+,"557de1cd99f1b4d25f681d822c060598","sys_file_metadata",1,"file",,,,0,0,0,"sys_file",1,,,,,,,,
+,"4821da930346696406e3ccf3ec22d999","sys_file_metadata",21,"file",,,,0,0,0,"sys_file",21,,,,,,,,
+,"aa821da8cdc56afc736974735c9b1c1c","sys_file_reference",126,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,
+,"8e50f38980afa6f4e84530b12f9cd0b3","sys_file_reference",127,"uid_local",,,,0,0,0,"sys_file",21,,,,,,,,
+,"c08c2538c324b0a98b0957bc4bdf36ae","sys_file_reference",129,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,
+,"a1f2ffdc6bf235cb5516c4bfdeec5552","tt_content",330,"image",,,,0,0,0,"sys_file_reference",127,,,,,,,,
+,"fc208fc9d55a71b2faa9f4e4d4fa941d","tt_content",330,"image",,,,1,0,0,"sys_file_reference",126,,,,,,,,
+,"0b7edf2205371519698cdfbf6e0cc6e7","sys_file_reference",128,"uid_local",,,,0,1,0,"sys_file",21,,,,,,,,
+,"997297edc2047a0fd48ffc237299a902","tt_content",331,"image",,,,0,0,0,"sys_file_reference",129,,,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentWFileReference.csv b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentWFileReference.csv
index a82587fe7bd4b3cbe1985c937ddb80c849c07bbb..8e889aa3dc0dac4adc0b356362f1699a83b43e0b 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentWFileReference.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentWFileReference.csv
@@ -9,8 +9,19 @@
,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,
,331,89,512,0,0,0,0,0,0,0,0,0,"Testing #1",2,,,,,,
"sys_refindex",,,,,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,,,,
-,"1f1d715dd5783cd50ecbda978e23dccb","sys_file_reference",128,"uid_local",0,0,0,"sys_file",21,,,,,,,,,,,
-,"c08c2538c324b0a98b0957bc4bdf36ae","sys_file_reference",129,"uid_local",0,0,0,"sys_file",1,,,,,,,,,,,
-,"48540de7710e3082f347bdd65ca340f2","tt_content",331,"image",0,0,0,"sys_file_reference",128,,,,,,,,,,,
-,"ceaebd2148901a6d7b0a52c546aa5218","tt_content",331,"image",1,0,0,"sys_file_reference",129,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,,,,,,
+,"b1315f6a325027205050c81764294b72","sys_file",1,"storage",,,,0,0,0,"sys_file_storage",1,,,,,,,,
+,"10034d14de6b8c87aa0096de9d029498","sys_file",1,"metadata",,,,0,0,0,"sys_file_metadata",1,,,,,,,,
+,"6588728f1c2f2069b4b781ab1d102fff","sys_file",21,"storage",,,,0,0,0,"sys_file_storage",1,,,,,,,,
+,"ff0a9ca5f364b75bccb699b74d167c83","sys_file",21,"metadata",,,,0,0,0,"sys_file_metadata",21,,,,,,,,
+,"557de1cd99f1b4d25f681d822c060598","sys_file_metadata",1,"file",,,,0,0,0,"sys_file",1,,,,,,,,
+,"4821da930346696406e3ccf3ec22d999","sys_file_metadata",21,"file",,,,0,0,0,"sys_file",21,,,,,,,,
+,"aa821da8cdc56afc736974735c9b1c1c","sys_file_reference",126,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,
+,"8e50f38980afa6f4e84530b12f9cd0b3","sys_file_reference",127,"uid_local",,,,0,0,0,"sys_file",21,,,,,,,,
+,"1f1d715dd5783cd50ecbda978e23dccb","sys_file_reference",128,"uid_local",,,,0,0,0,"sys_file",21,,,,,,,,
+,"c08c2538c324b0a98b0957bc4bdf36ae","sys_file_reference",129,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,
+,"a1f2ffdc6bf235cb5516c4bfdeec5552","tt_content",330,"image",,,,0,0,0,"sys_file_reference",127,,,,,,,,
+,"fc208fc9d55a71b2faa9f4e4d4fa941d","tt_content",330,"image",,,,1,0,0,"sys_file_reference",126,,,,,,,,
+,"48540de7710e3082f347bdd65ca340f2","tt_content",331,"image",,,,0,0,0,"sys_file_reference",128,,,,,,,,
+,"ceaebd2148901a6d7b0a52c546aa5218","tt_content",331,"image",,,,1,0,0,"sys_file_reference",129,,,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/moveContentToDifferentPage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/moveContentToDifferentPage.csv
index d9440f6c857821640b1e41bf06a61e4f33840a57..2a09b4bc542953c03e827b2dfeea0cc877e880e0 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/moveContentToDifferentPage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/moveContentToDifferentPage.csv
@@ -9,4 +9,19 @@
,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,
,331,90,256,0,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,
"sys_refindex",,,,,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,,,,,,
+,"b1315f6a325027205050c81764294b72","sys_file",1,"storage",,,,0,0,0,"sys_file_storage",1,,,,,,,,
+,"10034d14de6b8c87aa0096de9d029498","sys_file",1,"metadata",,,,0,0,0,"sys_file_metadata",1,,,,,,,,
+,"6588728f1c2f2069b4b781ab1d102fff","sys_file",21,"storage",,,,0,0,0,"sys_file_storage",1,,,,,,,,
+,"ff0a9ca5f364b75bccb699b74d167c83","sys_file",21,"metadata",,,,0,0,0,"sys_file_metadata",21,,,,,,,,
+,"557de1cd99f1b4d25f681d822c060598","sys_file_metadata",1,"file",,,,0,0,0,"sys_file",1,,,,,,,,
+,"4821da930346696406e3ccf3ec22d999","sys_file_metadata",21,"file",,,,0,0,0,"sys_file",21,,,,,,,,
+,"aa821da8cdc56afc736974735c9b1c1c","sys_file_reference",126,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,
+,"8e50f38980afa6f4e84530b12f9cd0b3","sys_file_reference",127,"uid_local",,,,0,0,0,"sys_file",21,,,,,,,,
+,"1f1d715dd5783cd50ecbda978e23dccb","sys_file_reference",128,"uid_local",,,,0,0,0,"sys_file",21,,,,,,,,
+,"c08c2538c324b0a98b0957bc4bdf36ae","sys_file_reference",129,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,
+,"a1f2ffdc6bf235cb5516c4bfdeec5552","tt_content",330,"image",,,,0,0,0,"sys_file_reference",127,,,,,,,,
+,"fc208fc9d55a71b2faa9f4e4d4fa941d","tt_content",330,"image",,,,1,0,0,"sys_file_reference",126,,,,,,,,
+,"48540de7710e3082f347bdd65ca340f2","tt_content",331,"image",,,,0,0,0,"sys_file_reference",128,,,,,,,,
+,"ceaebd2148901a6d7b0a52c546aa5218","tt_content",331,"image",,,,1,0,0,"sys_file_reference",129,,,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/moveContentToDifferentPageNChangeSorting.csv b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/moveContentToDifferentPageNChangeSorting.csv
index f22fa0a955a7d7f449d5aaf5de4a8e3d9e8a63d5..47e2ae3cbf1d43be6078b647101e87a1c0c8bb30 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/moveContentToDifferentPageNChangeSorting.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/DataSet/moveContentToDifferentPageNChangeSorting.csv
@@ -9,4 +9,19 @@
,330,90,512,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,
,331,90,256,0,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,,
"sys_refindex",,,,,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,,,,,,
+,"b1315f6a325027205050c81764294b72","sys_file",1,"storage",,,,0,0,0,"sys_file_storage",1,,,,,,,,
+,"10034d14de6b8c87aa0096de9d029498","sys_file",1,"metadata",,,,0,0,0,"sys_file_metadata",1,,,,,,,,
+,"6588728f1c2f2069b4b781ab1d102fff","sys_file",21,"storage",,,,0,0,0,"sys_file_storage",1,,,,,,,,
+,"ff0a9ca5f364b75bccb699b74d167c83","sys_file",21,"metadata",,,,0,0,0,"sys_file_metadata",21,,,,,,,,
+,"557de1cd99f1b4d25f681d822c060598","sys_file_metadata",1,"file",,,,0,0,0,"sys_file",1,,,,,,,,
+,"4821da930346696406e3ccf3ec22d999","sys_file_metadata",21,"file",,,,0,0,0,"sys_file",21,,,,,,,,
+,"aa821da8cdc56afc736974735c9b1c1c","sys_file_reference",126,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,
+,"8e50f38980afa6f4e84530b12f9cd0b3","sys_file_reference",127,"uid_local",,,,0,0,0,"sys_file",21,,,,,,,,
+,"1f1d715dd5783cd50ecbda978e23dccb","sys_file_reference",128,"uid_local",,,,0,0,0,"sys_file",21,,,,,,,,
+,"c08c2538c324b0a98b0957bc4bdf36ae","sys_file_reference",129,"uid_local",,,,0,0,0,"sys_file",1,,,,,,,,
+,"a1f2ffdc6bf235cb5516c4bfdeec5552","tt_content",330,"image",,,,0,0,0,"sys_file_reference",127,,,,,,,,
+,"fc208fc9d55a71b2faa9f4e4d4fa941d","tt_content",330,"image",,,,1,0,0,"sys_file_reference",126,,,,,,,,
+,"48540de7710e3082f347bdd65ca340f2","tt_content",331,"image",,,,0,0,0,"sys_file_reference",128,,,,,,,,
+,"ceaebd2148901a6d7b0a52c546aa5218","tt_content",331,"image",,,,1,0,0,"sys_file_reference",129,,,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/FlexformIrre/ActionTest.php b/typo3/sysext/core/Tests/Functional/DataHandling/FlexformIrre/ActionTest.php
index bcf9366040d70d4cd5296be4c394fc13c046dbf4..c70563dc34f1836ce685167f0b7c3562d7c747e0 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/FlexformIrre/ActionTest.php
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/FlexformIrre/ActionTest.php
@@ -35,6 +35,12 @@ class ActionTest extends AbstractDataHandlerActionTestCase
*/
protected $scenarioDataSetDirectory = 'typo3/sysext/core/Tests/Functional/DataHandling/FlexformIrre/DataSet/';
+ /**
+ * @var bool
+ * @todo: Test setup should be updated to have true here
+ */
+ protected $assertCleanReferenceIndex = false;
+
/**
* @test
*/
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Group/AbstractActionTestCase.php b/typo3/sysext/core/Tests/Functional/DataHandling/Group/AbstractActionTestCase.php
index 2e20563b86fbcf18b8053b0190644501542d3f56..e4765ae2d0d0f72e20f243a682a082ef4b6d8c7b 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Group/AbstractActionTestCase.php
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Group/AbstractActionTestCase.php
@@ -49,7 +49,6 @@ abstract class AbstractActionTestCase extends AbstractDataHandlerActionTestCase
parent::setUp();
$this->importScenarioDataSet('LiveDefaultPages');
$this->importScenarioDataSet('LiveDefaultElements');
- $this->importScenarioDataSet('ReferenceIndex');
$this->setUpFrontendSite(1, $this->siteLanguageConfiguration);
$this->setUpFrontendRootPage(1, ['typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.typoscript']);
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Group/DataSet/LiveDefaultElements.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Group/DataSet/LiveDefaultElements.csv
index 384cf81927eb66559b72f9126654d55b391883fe..95272bb417682355dd16a829ebade97c35e41c2f 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Group/DataSet/LiveDefaultElements.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Group/DataSet/LiveDefaultElements.csv
@@ -11,3 +11,9 @@
,1,89,256,0,0,0,0,0,0,0,0,0,"Element #1",
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
+"sys_refindex",,,,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"67070566eb5b788c5edd02dbdbc63da1","tt_content",297,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"250d3cfe7e1d9944e5c1e3bd086390e9","tt_content",297,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"c00137ed5ffdd2dafc067fdc3507a197","tt_content",298,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"e6e296f8287da20e27112548083fda67","tt_content",298,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",3,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Group/DataSet/ReferenceIndex.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Group/DataSet/ReferenceIndex.csv
deleted file mode 100644
index 3df039d3a25fd93bded7551046ac3a8aa272abf8..0000000000000000000000000000000000000000
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Group/DataSet/ReferenceIndex.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-"sys_refindex",,,,,,,,,,,,
-,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","ref_table","ref_uid","ref_string"
-,"0c81d9b3f27460380a2e442fdfa0649d","tt_content",298,"tx_testdatahandler_group",,,,0,0,"tx_testdatahandler_element",2,
-,"8f3d6a0de293045066188fc790f4805f","tt_content",298,"tx_testdatahandler_group",,,,1,0,"tx_testdatahandler_element",3,
-# @todo: The hash fields of next 2 rows are probably wrong
-,"70386199b2e7d7e3be07ec7b501f411d","tt_content",297,"tx_testdatahandler_group",,,,0,0,"tx_testdatahandler_element",1,
-,"3f113b20cdf1b3be96048a257872a178","tt_content",297,"tx_testdatahandler_group",,,,1,0,"tx_testdatahandler_element",2,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/ActionTest.php b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/ActionTest.php
index 9969e9bda8224a8c8712c00fd6687304eafd92be..5ab0bb25aa9b0401bbd8588643a9f6541430e265 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/ActionTest.php
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/ActionTest.php
@@ -28,8 +28,13 @@ class ActionTest extends AbstractActionTestCase
protected $assertionDataSetDirectory = 'typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/';
/**
- * Relations
+ * @test
*/
+ public function verifyCleanReferenceIndex()
+ {
+ // The test verifies the imported data set has a clean reference index by the check in tearDown()
+ self::assertTrue(true);
+ }
/**
* @test
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/addElementRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/addElementRelation.csv
index 9fb036467fae85f99be868149323cfabfeb2c88a..179a58459b60b82bbd4d64f71d455658b9eaa66d 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/addElementRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/addElementRelation.csv
@@ -14,9 +14,9 @@
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"0c81d9b3f27460380a2e442fdfa0649d","tt_content",298,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"8f3d6a0de293045066188fc790f4805f","tt_content",298,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",3,,,,,
-,"67070566eb5b788c5edd02dbdbc63da1","tt_content",297,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"250d3cfe7e1d9944e5c1e3bd086390e9","tt_content",297,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",2,,,,,
-,"01561cfe9bcea138e609e23e4e60fa17","tt_content",297,"tx_testdatahandler_group",2,0,0,"tx_testdatahandler_element",3,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"67070566eb5b788c5edd02dbdbc63da1","tt_content",297,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"250d3cfe7e1d9944e5c1e3bd086390e9","tt_content",297,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"c00137ed5ffdd2dafc067fdc3507a197","tt_content",298,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"e6e296f8287da20e27112548083fda67","tt_content",298,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",3,,
+,"01561cfe9bcea138e609e23e4e60fa17","tt_content",297,"tx_testdatahandler_group",,,,2,0,0,"tx_testdatahandler_element",3,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/changeElementRelationSorting.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/changeElementRelationSorting.csv
index 4c33d8e62a3ac5850c8aeadb470acd2d945a48ad..21206626257a4f6a10a183bf771df3c8f1294fb6 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/changeElementRelationSorting.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/changeElementRelationSorting.csv
@@ -14,8 +14,8 @@
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"0c81d9b3f27460380a2e442fdfa0649d","tt_content",298,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"8f3d6a0de293045066188fc790f4805f","tt_content",298,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",3,,,,,
-,"4acefc6001f2b89ee48fc0a8192c5e83","tt_content",297,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"fb7f6cae99d7fee8e3b8bf8270f5cc0e","tt_content",297,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",1,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"c00137ed5ffdd2dafc067fdc3507a197","tt_content",298,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"e6e296f8287da20e27112548083fda67","tt_content",298,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",3,,
+,"4acefc6001f2b89ee48fc0a8192c5e83","tt_content",297,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"fb7f6cae99d7fee8e3b8bf8270f5cc0e","tt_content",297,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",1,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/changeElementSorting.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/changeElementSorting.csv
index a610bd0941807b1a3c5b3c04bed3f36ff7bbee0d..46fb1f2f068b6ac0cac4ee577cec4b1fbbd806d1 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/changeElementSorting.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/changeElementSorting.csv
@@ -14,8 +14,8 @@
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"0c81d9b3f27460380a2e442fdfa0649d","tt_content",298,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"8f3d6a0de293045066188fc790f4805f","tt_content",298,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",3,,,,,
-,"70386199b2e7d7e3be07ec7b501f411d","tt_content",297,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"3f113b20cdf1b3be96048a257872a178","tt_content",297,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",2,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"67070566eb5b788c5edd02dbdbc63da1","tt_content",297,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"250d3cfe7e1d9944e5c1e3bd086390e9","tt_content",297,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"c00137ed5ffdd2dafc067fdc3507a197","tt_content",298,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"e6e296f8287da20e27112548083fda67","tt_content",298,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",3,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/copyContentOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/copyContentOfRelation.csv
index e8e4b5e407d277bfb170b4cb4efd0df504b58f7a..636a5796f707a5f98a4b8493516d1ed4cc769de6 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/copyContentOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/copyContentOfRelation.csv
@@ -15,10 +15,10 @@
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"0c81d9b3f27460380a2e442fdfa0649d","tt_content",298,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"8f3d6a0de293045066188fc790f4805f","tt_content",298,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",3,,,,,
-,"70386199b2e7d7e3be07ec7b501f411d","tt_content",297,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"3f113b20cdf1b3be96048a257872a178","tt_content",297,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",2,,,,,
-,"45054a4c3f0fd0a59cc321551ded75d4","tt_content",299,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"2322ee328718aeeb30ba7ea9d305312a","tt_content",299,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",3,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"67070566eb5b788c5edd02dbdbc63da1","tt_content",297,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"250d3cfe7e1d9944e5c1e3bd086390e9","tt_content",297,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"c00137ed5ffdd2dafc067fdc3507a197","tt_content",298,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"e6e296f8287da20e27112548083fda67","tt_content",298,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",3,,
+,"45054a4c3f0fd0a59cc321551ded75d4","tt_content",299,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"2322ee328718aeeb30ba7ea9d305312a","tt_content",299,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",3,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/copyContentToLanguageOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/copyContentToLanguageOfRelation.csv
index 0b1f2ef707ccf4848738f3c644a2de0b9c2df0f5..8f9a6642e5b6cfafbed93a03940a702d2dbbeeae 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/copyContentToLanguageOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/copyContentToLanguageOfRelation.csv
@@ -16,12 +16,12 @@
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"0c81d9b3f27460380a2e442fdfa0649d","tt_content",298,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"8f3d6a0de293045066188fc790f4805f","tt_content",298,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",3,,,,,
-,"70386199b2e7d7e3be07ec7b501f411d","tt_content",297,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"3f113b20cdf1b3be96048a257872a178","tt_content",297,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",2,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"45054a4c3f0fd0a59cc321551ded75d4","tt_content",299,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"2322ee328718aeeb30ba7ea9d305312a","tt_content",299,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",3,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"67070566eb5b788c5edd02dbdbc63da1","tt_content",297,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"250d3cfe7e1d9944e5c1e3bd086390e9","tt_content",297,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"c00137ed5ffdd2dafc067fdc3507a197","tt_content",298,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"e6e296f8287da20e27112548083fda67","tt_content",298,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",3,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"45054a4c3f0fd0a59cc321551ded75d4","tt_content",299,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"2322ee328718aeeb30ba7ea9d305312a","tt_content",299,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",3,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/copyElementOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/copyElementOfRelation.csv
index c6b39de6cac4b0f635abed35b2161e9d5f048101..14d752507ff713c30c0e88dc28a94bd863956a1e 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/copyElementOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/copyElementOfRelation.csv
@@ -15,8 +15,8 @@
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
,4,89,128,0,0,0,1,0,0,0,0,0,"Element #1 (copy 1)",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"0c81d9b3f27460380a2e442fdfa0649d","tt_content",298,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"8f3d6a0de293045066188fc790f4805f","tt_content",298,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",3,,,,,
-,"70386199b2e7d7e3be07ec7b501f411d","tt_content",297,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"3f113b20cdf1b3be96048a257872a178","tt_content",297,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",2,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"67070566eb5b788c5edd02dbdbc63da1","tt_content",297,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"250d3cfe7e1d9944e5c1e3bd086390e9","tt_content",297,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"c00137ed5ffdd2dafc067fdc3507a197","tt_content",298,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"e6e296f8287da20e27112548083fda67","tt_content",298,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",3,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/copyElementToLanguageOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/copyElementToLanguageOfRelation.csv
index 62deeba441fbe192f76053ec1417482258fb7783..32b7153ed33078b8530c727e04783549ef49e80a 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/copyElementToLanguageOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/copyElementToLanguageOfRelation.csv
@@ -15,9 +15,9 @@
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
,4,89,384,0,1,0,1,0,0,0,0,0,"[Translate to Dansk:] Element #1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"0c81d9b3f27460380a2e442fdfa0649d","tt_content",298,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"8f3d6a0de293045066188fc790f4805f","tt_content",298,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",3,,,,,
-,"70386199b2e7d7e3be07ec7b501f411d","tt_content",297,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"3f113b20cdf1b3be96048a257872a178","tt_content",297,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",2,,,,,
-,"6295e5b12a34d93181092e4ba52085aa","tx_testdatahandler_element",4,"sys_language_uid",0,0,0,"sys_language",1,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"67070566eb5b788c5edd02dbdbc63da1","tt_content",297,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"250d3cfe7e1d9944e5c1e3bd086390e9","tt_content",297,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"c00137ed5ffdd2dafc067fdc3507a197","tt_content",298,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"e6e296f8287da20e27112548083fda67","tt_content",298,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",3,,
+,"6295e5b12a34d93181092e4ba52085aa","tx_testdatahandler_element",4,"sys_language_uid",,,,0,0,0,"sys_language",1,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/createContentNAddRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/createContentNAddRelation.csv
index a017e0967c3e564d440e6268d7eafc0085e9b291..6a86a68b5567f392e281deeff2b77afec1eabb44 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/createContentNAddRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/createContentNAddRelation.csv
@@ -15,9 +15,9 @@
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"0c81d9b3f27460380a2e442fdfa0649d","tt_content",298,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"8f3d6a0de293045066188fc790f4805f","tt_content",298,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",3,,,,,
-,"70386199b2e7d7e3be07ec7b501f411d","tt_content",297,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"3f113b20cdf1b3be96048a257872a178","tt_content",297,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",2,,,,,
-,"42a2972965c7beb8b55f1f967bbade25","tt_content",299,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",1,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"67070566eb5b788c5edd02dbdbc63da1","tt_content",297,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"250d3cfe7e1d9944e5c1e3bd086390e9","tt_content",297,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"c00137ed5ffdd2dafc067fdc3507a197","tt_content",298,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"e6e296f8287da20e27112548083fda67","tt_content",298,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",3,,
+,"42a2972965c7beb8b55f1f967bbade25","tt_content",299,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",1,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/createContentNCreateRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/createContentNCreateRelation.csv
index 8c5520e73b61385020484c47d0aa528fd5885f48..f92b67e856d45e98395138e9c1e9da5c698dcbfa 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/createContentNCreateRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/createContentNCreateRelation.csv
@@ -16,9 +16,9 @@
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
,4,89,128,0,0,0,0,0,0,0,0,0,"Testing #1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"0c81d9b3f27460380a2e442fdfa0649d","tt_content",298,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"8f3d6a0de293045066188fc790f4805f","tt_content",298,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",3,,,,,
-,"70386199b2e7d7e3be07ec7b501f411d","tt_content",297,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"3f113b20cdf1b3be96048a257872a178","tt_content",297,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",2,,,,,
-,"a4d18a0ab241abc9b222e53c6d56d78d","tt_content",299,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",4,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"67070566eb5b788c5edd02dbdbc63da1","tt_content",297,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"250d3cfe7e1d9944e5c1e3bd086390e9","tt_content",297,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"c00137ed5ffdd2dafc067fdc3507a197","tt_content",298,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"e6e296f8287da20e27112548083fda67","tt_content",298,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",3,,
+,"a4d18a0ab241abc9b222e53c6d56d78d","tt_content",299,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",4,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/deleteContentOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/deleteContentOfRelation.csv
index 7de101658a2e7481593fcec52f9bf1fb885a2977..855ff17fa0748a8ac7b4de9a08f7c9a773c7f979 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/deleteContentOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/deleteContentOfRelation.csv
@@ -14,8 +14,8 @@
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"70386199b2e7d7e3be07ec7b501f411d","tt_content",297,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"3f113b20cdf1b3be96048a257872a178","tt_content",297,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",2,,,,,
-,"dca3c21185d9d3221b9ae709920d7000","tt_content",298,"tx_testdatahandler_group",0,1,0,"tx_testdatahandler_element",2,,,,,
-,"fce90407bfd50981fca709aaf2a297f3","tt_content",298,"tx_testdatahandler_group",1,1,0,"tx_testdatahandler_element",3,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"67070566eb5b788c5edd02dbdbc63da1","tt_content",297,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"250d3cfe7e1d9944e5c1e3bd086390e9","tt_content",297,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"dca3c21185d9d3221b9ae709920d7000","tt_content",298,"tx_testdatahandler_group",,,,0,1,0,"tx_testdatahandler_element",2,,
+,"fce90407bfd50981fca709aaf2a297f3","tt_content",298,"tx_testdatahandler_group",,,,1,1,0,"tx_testdatahandler_element",3,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/deleteElementOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/deleteElementOfRelation.csv
index 0f1aedcc333f978f207f1126df65f56fec61781e..ce2433e9c3a2f2f94aa066371c9c1fd254e6faad 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/deleteElementOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/deleteElementOfRelation.csv
@@ -14,9 +14,8 @@
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"0c81d9b3f27460380a2e442fdfa0649d","tt_content",298,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"8f3d6a0de293045066188fc790f4805f","tt_content",298,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",3,,,,,
-# @todo: Next row should be gone or deleted=1 - issue in ReferenceIndex group handling?
-,"67070566eb5b788c5edd02dbdbc63da1","tt_content",297,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"250d3cfe7e1d9944e5c1e3bd086390e9","tt_content",297,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",2,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"67070566eb5b788c5edd02dbdbc63da1","tt_content",297,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"250d3cfe7e1d9944e5c1e3bd086390e9","tt_content",297,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"c00137ed5ffdd2dafc067fdc3507a197","tt_content",298,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"e6e296f8287da20e27112548083fda67","tt_content",298,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",3,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/deleteElementRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/deleteElementRelation.csv
index a4cc3ffd9e1985cbc34e714d1f55212bc79f7881..561559e606f6efef3ee9d828660f142198535e57 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/deleteElementRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/deleteElementRelation.csv
@@ -14,7 +14,7 @@
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"0c81d9b3f27460380a2e442fdfa0649d","tt_content",298,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"8f3d6a0de293045066188fc790f4805f","tt_content",298,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",3,,,,,
-,"67070566eb5b788c5edd02dbdbc63da1","tt_content",297,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",1,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"67070566eb5b788c5edd02dbdbc63da1","tt_content",297,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"c00137ed5ffdd2dafc067fdc3507a197","tt_content",298,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"e6e296f8287da20e27112548083fda67","tt_content",298,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",3,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeContentChainOfRelationWSynchronizationSource.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeContentChainOfRelationWSynchronizationSource.csv
index b6ef5a63b6b0f03c05904993548e24ccaf7522a2..ca5e415db1a11bd03387d5353a87d4e976723d08 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeContentChainOfRelationWSynchronizationSource.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeContentChainOfRelationWSynchronizationSource.csv
@@ -16,14 +16,14 @@
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",,
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",,
"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
-,"70386199b2e7d7e3be07ec7b501f411d","tt_content",297,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",1,,,,,,
-,"3f113b20cdf1b3be96048a257872a178","tt_content",297,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",2,,,,,,
-,"aa9d44bd50d47873e29c5a4987bda6e0","tt_content",299,"l18n_parent",0,0,0,"tt_content",298,,,,,,
-,"ff5b07a6c39d986fcf41e56dacc4e181","tt_content",300,"l18n_parent",0,0,0,"tt_content",298,,,,,,
-,"898c6e412c992faf684eae5190ff3fb4","tt_content",298,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",1,,,,,,
-,"a9daf046605f3ac2dbc99e7cf1fdc936","tt_content",298,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",2,,,,,,
-,"42a2972965c7beb8b55f1f967bbade25","tt_content",299,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",1,,,,,,
-,"3f4b89619980777f7a3b5213ffa2d823","tt_content",299,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",2,,,,,,
-,"6ca0ebbb88ba3e0dc7cb25d61ae1e501","tt_content",300,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",1,,,,,,
-,"e9e06d07b4ea4d9a76cfc8ade4001b51","tt_content",300,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",2,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"67070566eb5b788c5edd02dbdbc63da1","tt_content",297,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",1,,,
+,"250d3cfe7e1d9944e5c1e3bd086390e9","tt_content",297,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",2,,,
+,"aa9d44bd50d47873e29c5a4987bda6e0","tt_content",299,"l18n_parent",,,,0,0,0,"tt_content",298,,,
+,"ff5b07a6c39d986fcf41e56dacc4e181","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",298,,,
+,"898c6e412c992faf684eae5190ff3fb4","tt_content",298,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",1,,,
+,"a9daf046605f3ac2dbc99e7cf1fdc936","tt_content",298,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",2,,,
+,"42a2972965c7beb8b55f1f967bbade25","tt_content",299,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",1,,,
+,"3f4b89619980777f7a3b5213ffa2d823","tt_content",299,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",2,,,
+,"6ca0ebbb88ba3e0dc7cb25d61ae1e501","tt_content",300,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",1,,,
+,"e9e06d07b4ea4d9a76cfc8ade4001b51","tt_content",300,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",2,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeContentOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeContentOfRelation.csv
index 6d81ff666468431b215900eda18da5caa8ee4346..a5d5d0fa37c6c2366acc7f3cbfebb27327381286 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeContentOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeContentOfRelation.csv
@@ -15,11 +15,11 @@
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"0c81d9b3f27460380a2e442fdfa0649d","tt_content",298,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"8f3d6a0de293045066188fc790f4805f","tt_content",298,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",3,,,,,
-,"70386199b2e7d7e3be07ec7b501f411d","tt_content",297,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"3f113b20cdf1b3be96048a257872a178","tt_content",297,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",2,,,,,
-,"aa9d44bd50d47873e29c5a4987bda6e0","tt_content",299,"l18n_parent",0,0,0,"tt_content",298,,,,,
-,"45054a4c3f0fd0a59cc321551ded75d4","tt_content",299,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"2322ee328718aeeb30ba7ea9d305312a","tt_content",299,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",3,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"67070566eb5b788c5edd02dbdbc63da1","tt_content",297,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"250d3cfe7e1d9944e5c1e3bd086390e9","tt_content",297,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"c00137ed5ffdd2dafc067fdc3507a197","tt_content",298,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"e6e296f8287da20e27112548083fda67","tt_content",298,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",3,,
+,"aa9d44bd50d47873e29c5a4987bda6e0","tt_content",299,"l18n_parent",,,,0,0,0,"tt_content",298,,
+,"45054a4c3f0fd0a59cc321551ded75d4","tt_content",299,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"2322ee328718aeeb30ba7ea9d305312a","tt_content",299,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",3,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeContentOfRelationWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeContentOfRelationWSynchronization.csv
index 29f8b75e54eba7aa6838048e1d6e601db35d06a3..0db7410456e89821b9daf74ce8cb7c7c66d86d60 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeContentOfRelationWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeContentOfRelationWSynchronization.csv
@@ -6,8 +6,8 @@
,90,88,512,0,0,0,0,0,0,0,"Target",,,,
"tt_content",,,,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_testdatahandler_group","l10n_state"
-,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1","1,2",\NULL
-,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2","1,2",\NULL
+,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1","1,2","\NULL"
+,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2","1,2","\NULL"
,299,89,768,0,1,298,298,0,0,0,0,0,"[Translate to Dansk:] Regular Element #2","1,2","{""tx_testdatahandler_group"":""parent""}"
"tx_testdatahandler_element",,,,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",,
@@ -15,11 +15,11 @@
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",,
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",,
"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
-,"70386199b2e7d7e3be07ec7b501f411d","tt_content",297,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",1,,,,,,
-,"3f113b20cdf1b3be96048a257872a178","tt_content",297,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",2,,,,,,
-,"aa9d44bd50d47873e29c5a4987bda6e0","tt_content",299,"l18n_parent",0,0,0,"tt_content",298,,,,,,
-,"898c6e412c992faf684eae5190ff3fb4","tt_content",298,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",1,,,,,,
-,"a9daf046605f3ac2dbc99e7cf1fdc936","tt_content",298,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",2,,,,,,
-,"42a2972965c7beb8b55f1f967bbade25","tt_content",299,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",1,,,,,,
-,"3f4b89619980777f7a3b5213ffa2d823","tt_content",299,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",2,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"67070566eb5b788c5edd02dbdbc63da1","tt_content",297,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",1,,,
+,"250d3cfe7e1d9944e5c1e3bd086390e9","tt_content",297,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",2,,,
+,"aa9d44bd50d47873e29c5a4987bda6e0","tt_content",299,"l18n_parent",,,,0,0,0,"tt_content",298,,,
+,"898c6e412c992faf684eae5190ff3fb4","tt_content",298,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",1,,,
+,"a9daf046605f3ac2dbc99e7cf1fdc936","tt_content",298,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",2,,,
+,"42a2972965c7beb8b55f1f967bbade25","tt_content",299,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",1,,,
+,"3f4b89619980777f7a3b5213ffa2d823","tt_content",299,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",2,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeElementOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeElementOfRelation.csv
index c6975f41043902893a35d0c7cb818f71ec388bbd..af2097386a763ed86fcb5bc7589bd9306755a675 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeElementOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/localizeElementOfRelation.csv
@@ -16,12 +16,12 @@
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
,4,89,384,0,1,1,1,0,0,0,0,0,"[Translate to Dansk:] Element #1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"0c81d9b3f27460380a2e442fdfa0649d","tt_content",298,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"8f3d6a0de293045066188fc790f4805f","tt_content",298,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",3,,,,,
-,"70386199b2e7d7e3be07ec7b501f411d","tt_content",297,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"3f113b20cdf1b3be96048a257872a178","tt_content",297,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",2,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"6295e5b12a34d93181092e4ba52085aa","tx_testdatahandler_element",4,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"32a0e9a36faa56d270354f77654b15f7","tx_testdatahandler_element",4,"l10n_parent",0,0,0,"tx_irretutorial_1nff_hotel",1,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"67070566eb5b788c5edd02dbdbc63da1","tt_content",297,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"250d3cfe7e1d9944e5c1e3bd086390e9","tt_content",297,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"c00137ed5ffdd2dafc067fdc3507a197","tt_content",298,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"e6e296f8287da20e27112548083fda67","tt_content",298,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",3,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"6295e5b12a34d93181092e4ba52085aa","tx_testdatahandler_element",4,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"32a0e9a36faa56d270354f77654b15f7","tx_testdatahandler_element",4,"l10n_parent",,,,0,0,0,"tx_irretutorial_1nff_hotel",1,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/modifyBothSidesOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/modifyBothSidesOfRelation.csv
index c7f157212fcc7aedc4d70ac61c95d3992f39b5e6..a5fcca6f1f5d1d92784cc6243a50f9372438a148 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/modifyBothSidesOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/modifyBothSidesOfRelation.csv
@@ -14,8 +14,8 @@
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"0c81d9b3f27460380a2e442fdfa0649d","tt_content",298,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"8f3d6a0de293045066188fc790f4805f","tt_content",298,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",3,,,,,
-,"67070566eb5b788c5edd02dbdbc63da1","tt_content",297,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"250d3cfe7e1d9944e5c1e3bd086390e9","tt_content",297,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",2,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"67070566eb5b788c5edd02dbdbc63da1","tt_content",297,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"250d3cfe7e1d9944e5c1e3bd086390e9","tt_content",297,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"c00137ed5ffdd2dafc067fdc3507a197","tt_content",298,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"e6e296f8287da20e27112548083fda67","tt_content",298,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",3,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/modifyContentOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/modifyContentOfRelation.csv
index 022d4f54df013e5023675af07952bc3a5040f58f..19d95ad65f56753098fb7d893d0db8d5f8bebd5c 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/modifyContentOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/modifyContentOfRelation.csv
@@ -14,8 +14,8 @@
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"0c81d9b3f27460380a2e442fdfa0649d","tt_content",298,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"8f3d6a0de293045066188fc790f4805f","tt_content",298,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",3,,,,,
-,"67070566eb5b788c5edd02dbdbc63da1","tt_content",297,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"250d3cfe7e1d9944e5c1e3bd086390e9","tt_content",297,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",2,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"67070566eb5b788c5edd02dbdbc63da1","tt_content",297,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"250d3cfe7e1d9944e5c1e3bd086390e9","tt_content",297,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"c00137ed5ffdd2dafc067fdc3507a197","tt_content",298,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"e6e296f8287da20e27112548083fda67","tt_content",298,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",3,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/modifyElementOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/modifyElementOfRelation.csv
index c5b2775c4d7017cdde9f827192ab0e81a7440eae..c512b1548f49ac9930ac3c35b7e9c869b2344d58 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/modifyElementOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/modifyElementOfRelation.csv
@@ -14,8 +14,8 @@
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"0c81d9b3f27460380a2e442fdfa0649d","tt_content",298,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"8f3d6a0de293045066188fc790f4805f","tt_content",298,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",3,,,,,
-,"70386199b2e7d7e3be07ec7b501f411d","tt_content",297,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"3f113b20cdf1b3be96048a257872a178","tt_content",297,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",2,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"67070566eb5b788c5edd02dbdbc63da1","tt_content",297,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"250d3cfe7e1d9944e5c1e3bd086390e9","tt_content",297,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"c00137ed5ffdd2dafc067fdc3507a197","tt_content",298,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"e6e296f8287da20e27112548083fda67","tt_content",298,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",3,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/moveContentOfRelationToDifferentPage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/moveContentOfRelationToDifferentPage.csv
index e2314c7bb58ec793679c7e4ae08004d6c9aebc61..1a57356860c5ef4e9ecc1c299c78eb8c92140db4 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/moveContentOfRelationToDifferentPage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/DataSet/moveContentOfRelationToDifferentPage.csv
@@ -14,8 +14,8 @@
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"0c81d9b3f27460380a2e442fdfa0649d","tt_content",298,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"8f3d6a0de293045066188fc790f4805f","tt_content",298,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",3,,,,,
-,"70386199b2e7d7e3be07ec7b501f411d","tt_content",297,"tx_testdatahandler_group",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"3f113b20cdf1b3be96048a257872a178","tt_content",297,"tx_testdatahandler_group",1,0,0,"tx_testdatahandler_element",2,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"67070566eb5b788c5edd02dbdbc63da1","tt_content",297,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"250d3cfe7e1d9944e5c1e3bd086390e9","tt_content",297,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"c00137ed5ffdd2dafc067fdc3507a197","tt_content",298,"tx_testdatahandler_group",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"e6e296f8287da20e27112548083fda67","tt_content",298,"tx_testdatahandler_group",,,,1,0,0,"tx_testdatahandler_element",3,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/DataSet/LiveDefaultElements.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/DataSet/LiveDefaultElements.csv
index 674b231771bb983ce4705b1a695fdd0e2059b318..a9bdd4056fde2be1751046430867a035828b97a4 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/DataSet/LiveDefaultElements.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/DataSet/LiveDefaultElements.csv
@@ -27,3 +27,20 @@
,11,89,16,0,0,0,,0,0,0,0,0,0,"Price #1.2.2",
,12,89,8,0,0,0,,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,,0,0,0,0,0,0,"Price #1.1.1",
+"sys_refindex",,,,,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,,
+,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3,,,
+,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4,,,
+,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,,,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,,,
+,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7,,,
+,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,,,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,,,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,,,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,,,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,,,
+,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12,,,
+,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/ActionTest.php b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/ActionTest.php
index 323b350e155030a3544a0c681dba310e1254029e..a30abfd49fdbabf898b14405edb6d2b370e4704c 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/ActionTest.php
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/ActionTest.php
@@ -29,8 +29,13 @@ class ActionTest extends AbstractActionTestCase
protected $assertionDataSetDirectory = 'typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/';
/**
- * Parent content records
+ * @test
*/
+ public function verifyCleanReferenceIndex()
+ {
+ // The test verifies the imported data set has a clean reference index by the check in tearDown()
+ self::assertTrue(true);
+ }
/**
* @test
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/changeParentContentSorting.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/changeParentContentSorting.csv
index 43a9f6c382bb7aef528c034d93ec130cea9c3662..38ac0eca081d4bca8aac6940864f16b28fcf16c0 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/changeParentContentSorting.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/changeParentContentSorting.csv
@@ -1,21 +1,21 @@
-tt_content,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,tx_irretutorial_1ncsv_hotels
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
,297,89,768,0,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",5
-tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,offers
+"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,2,89,1,0,0,0,0,0,0,0,0,0,"Hotel #0",
,3,89,256,0,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,0,"Hotel #1",8
-tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
+"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
,6,89,128,0,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,0,"Offer #1.1",13
-tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,
+"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,8,89,128,0,0,0,0,0,0,0,0,0,"Price #1.1.2",
,9,89,64,0,0,0,0,0,0,0,0,0,"Price #1.1.3",
@@ -24,4 +24,19 @@ tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
,12,89,8,0,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3,,
+,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4,,
+,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,,
+,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7,,
+,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,,
+,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12,,
+,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyPage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyPage.csv
index 8782e817ac9709e0e763af6e1f7a119f953b397b..ab5b528e17929fb936587fe2e6019aae31b0beba 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyPage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyPage.csv
@@ -1,18 +1,18 @@
-pages,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,tx_irretutorial_1ncsv_hotels,,
-,1,0,256,0,0,0,0,0,0,0,FunctionalTest,,,
-,88,1,256,0,0,0,0,0,0,0,DataHandlerTest,,,
-,89,88,256,0,0,0,0,0,0,0,Relations,2,,
-,90,88,512,0,0,0,0,0,0,0,Target,,,
-,91,90,256,0,89,0,0,0,0,0,Relations,6,,
-tt_content,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,tx_irretutorial_1ncsv_hotels
+"pages",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","tx_irretutorial_1ncsv_hotels",,
+,1,0,256,0,0,0,0,0,0,0,"FunctionalTest",,,
+,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest",,,
+,89,88,256,0,0,0,0,0,0,0,"Relations",2,,
+,90,88,512,0,0,0,0,0,0,0,"Target",,,
+,91,90,256,0,89,0,0,0,0,0,"Relations",6,,
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",5
,299,91,256,0,0,0,298,0,0,0,0,0,"Regular Element #2",7
,300,91,128,0,0,0,297,0,0,0,0,0,"Regular Element #1","8,9"
-tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,offers
+"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,2,89,1,0,0,0,0,0,0,0,0,0,"Hotel #0",
,3,89,256,0,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,0,"Hotel #2",7
@@ -21,8 +21,8 @@ tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
,7,91,64,0,0,0,5,0,0,0,0,0,"Hotel #1",9
,8,91,256,0,0,0,3,0,0,0,0,0,"Hotel #1","10,11"
,9,91,128,0,0,0,4,0,0,0,0,0,"Hotel #2",12
-tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
+"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
,6,89,128,0,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,0,"Offer #2.1",12
@@ -31,8 +31,8 @@ tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
,10,91,256,0,0,0,5,0,0,0,0,0,"Offer #1.1","15,16,17"
,11,91,128,0,0,0,6,0,0,0,0,0,"Offer #1.2","18,19"
,12,91,64,0,0,0,7,0,0,0,0,0,"Offer #2.1",20
-tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,
+"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,8,89,128,0,0,0,0,0,0,0,0,0,"Price #1.1.2",
,9,89,64,0,0,0,0,0,0,0,0,0,"Price #1.1.3",
@@ -48,19 +48,34 @@ tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
,19,91,16,0,0,0,11,0,0,0,0,0,"Price #1.2.2",
,20,91,8,0,0,0,12,0,0,0,0,0,"Price #2.1.1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"bb5a44775aad69cd24228d6076375e42","pages",91,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",6,,,,,
-,"82d25027c994d718124afddeffd4007e","tx_irretutorial_1ncsv_offer",9,"prices",0,0,0,"tx_irretutorial_1ncsv_price",14,,,,,
-,"4c1f01993ed751a775813566b2f9f61e","tx_irretutorial_1ncsv_hotel",7,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",9,,,,,
-,"3505a7e805dbc377cf4446bd0d584ee9","tt_content",299,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",7,,,,,
-,"49d52f16f30e90291550540de0ce765a","tx_irretutorial_1ncsv_offer",10,"prices",0,0,0,"tx_irretutorial_1ncsv_price",15,,,,,
-,"9aaf2d982e90a818d8389bf1b09225b9","tx_irretutorial_1ncsv_offer",10,"prices",1,0,0,"tx_irretutorial_1ncsv_price",16,,,,,
-,"3bbaa3c6ddf521ad177d3eaf30b7f2d5","tx_irretutorial_1ncsv_offer",10,"prices",2,0,0,"tx_irretutorial_1ncsv_price",17,,,,,
-,"df8555f2f4d2386cd83a3089754bc539","tx_irretutorial_1ncsv_offer",11,"prices",0,0,0,"tx_irretutorial_1ncsv_price",18,,,,,
-,"4772a452921cf36230f825af577142f1","tx_irretutorial_1ncsv_offer",11,"prices",1,0,0,"tx_irretutorial_1ncsv_price",19,,,,,
-,"04fe25e43f2c56699afd3962e2a937ac","tx_irretutorial_1ncsv_hotel",8,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",10,,,,,
-,"c90bd7a62d8c9342b6dc6d2cd3757657","tx_irretutorial_1ncsv_hotel",8,"offers",1,0,0,"tx_irretutorial_1ncsv_offer",11,,,,,
-,"51034ddb5328b2ed0f3626f3cbda8ade","tx_irretutorial_1ncsv_offer",12,"prices",0,0,0,"tx_irretutorial_1ncsv_price",20,,,,,
-,"c7887aa73735cb8d3714e5d58b4fab08","tx_irretutorial_1ncsv_hotel",9,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",12,,,,,
-,"35261c3913bef16c4f9a11b4afdf6b4f","tt_content",300,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",8,,,,,
-,"96eb8e495aaeb1172889df35cc7c6eca","tt_content",300,"tx_irretutorial_1ncsv_hotels",1,0,0,"tx_irretutorial_1ncsv_hotel",9,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3,,
+,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4,,
+,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,,
+,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7,,
+,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,,
+,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12,,
+,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,
+,"4c1f01993ed751a775813566b2f9f61e","tx_irretutorial_1ncsv_hotel",7,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",9,,
+,"04fe25e43f2c56699afd3962e2a937ac","tx_irretutorial_1ncsv_hotel",8,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",10,,
+,"c90bd7a62d8c9342b6dc6d2cd3757657","tx_irretutorial_1ncsv_hotel",8,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",11,,
+,"c7887aa73735cb8d3714e5d58b4fab08","tx_irretutorial_1ncsv_hotel",9,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",12,,
+,"bb5a44775aad69cd24228d6076375e42","pages",91,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",6,,
+,"82d25027c994d718124afddeffd4007e","tx_irretutorial_1ncsv_offer",9,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",14,,
+,"49d52f16f30e90291550540de0ce765a","tx_irretutorial_1ncsv_offer",10,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",15,,
+,"9aaf2d982e90a818d8389bf1b09225b9","tx_irretutorial_1ncsv_offer",10,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",16,,
+,"3bbaa3c6ddf521ad177d3eaf30b7f2d5","tx_irretutorial_1ncsv_offer",10,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",17,,
+,"df8555f2f4d2386cd83a3089754bc539","tx_irretutorial_1ncsv_offer",11,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",18,,
+,"4772a452921cf36230f825af577142f1","tx_irretutorial_1ncsv_offer",11,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",19,,
+,"51034ddb5328b2ed0f3626f3cbda8ade","tx_irretutorial_1ncsv_offer",12,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",20,,
+,"3505a7e805dbc377cf4446bd0d584ee9","tt_content",299,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",7,,
+,"35261c3913bef16c4f9a11b4afdf6b4f","tt_content",300,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",8,,
+,"96eb8e495aaeb1172889df35cc7c6eca","tt_content",300,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",9,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyPageWHotelBeforeParentContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyPageWHotelBeforeParentContent.csv
index 735b40a2807dd1e5a958ad434ef75290c3f6453e..e03985b6cbb871ff301db22d23324fc188c328ef 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyPageWHotelBeforeParentContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyPageWHotelBeforeParentContent.csv
@@ -1,18 +1,18 @@
-pages,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,tx_irretutorial_1ncsv_hotels,,
-,1,0,256,0,0,0,0,0,0,0,FunctionalTest,,,
-,88,1,256,0,0,0,0,0,0,0,DataHandlerTest,,,
-,89,88,256,0,0,0,0,0,0,0,Relations,2,,
-,90,88,512,0,0,0,0,0,0,0,Target,,,
-,91,90,256,0,89,0,0,0,0,0,Relations,6,,
-tt_content,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,tx_irretutorial_1ncsv_hotels
+"pages",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","tx_irretutorial_1ncsv_hotels",,
+,1,0,256,0,0,0,0,0,0,0,"FunctionalTest",,,
+,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest",,,
+,89,88,256,0,0,0,0,0,0,0,"Relations",2,,
+,90,88,512,0,0,0,0,0,0,0,"Target",,,
+,91,90,256,0,89,0,0,0,0,0,"Relations",6,,
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",5
,299,91,256,0,0,0,298,0,0,0,0,0,"Regular Element #2",9
,300,91,128,0,0,0,297,0,0,0,0,0,"Regular Element #1","7,8"
-tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,offers
+"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,2,89,1,0,0,0,0,0,0,0,0,0,"Hotel #0",
,3,89,256,0,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,0,"Hotel #2",7
@@ -21,8 +21,8 @@ tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
,7,91,256,0,0,0,3,0,0,0,0,0,"Hotel #1","9,10"
,8,91,128,0,0,0,4,0,0,0,0,0,"Hotel #2",11
,9,91,64,0,0,0,5,0,0,0,0,0,"Hotel #1",12
-tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
+"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
,6,89,128,0,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,0,"Offer #2.1",12
@@ -31,8 +31,8 @@ tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
,10,91,128,0,0,0,6,0,0,0,0,0,"Offer #1.2","17,18"
,11,91,64,0,0,0,7,0,0,0,0,0,"Offer #2.1",19
,12,91,32,0,0,0,8,0,0,0,0,0,"Offer #1.1",20
-tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,
+"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,8,89,128,0,0,0,0,0,0,0,0,0,"Price #1.1.2",
,9,89,64,0,0,0,0,0,0,0,0,0,"Price #1.1.3",
@@ -48,19 +48,34 @@ tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
,19,91,8,0,0,0,12,0,0,0,0,0,"Price #2.1.1",
,20,91,4,0,0,0,13,0,0,0,0,0,"Price #1.1.1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"bb5a44775aad69cd24228d6076375e42","pages",91,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",6,,,,,
-,"82d25027c994d718124afddeffd4007e","tx_irretutorial_1ncsv_offer",9,"prices",0,0,0,"tx_irretutorial_1ncsv_price",14,,,,,
-,"10ecd86acc14238ae88bc7534e1def98","tx_irretutorial_1ncsv_offer",9,"prices",1,0,0,"tx_irretutorial_1ncsv_price",15,,,,,
-,"98b3ed58412b44d6cb723f4908bab398","tx_irretutorial_1ncsv_offer",9,"prices",2,0,0,"tx_irretutorial_1ncsv_price",16,,,,,
-,"a96df8de72dc29a40a68a56e3e450651","tx_irretutorial_1ncsv_offer",10,"prices",0,0,0,"tx_irretutorial_1ncsv_price",17,,,,,
-,"c5ae65b6195a3079eb2ccf686ed0bacd","tx_irretutorial_1ncsv_offer",10,"prices",1,0,0,"tx_irretutorial_1ncsv_price",18,,,,,
-,"4c1f01993ed751a775813566b2f9f61e","tx_irretutorial_1ncsv_hotel",7,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",9,,,,,
-,"2823ad9144202733d75318f6ed0b1aa0","tx_irretutorial_1ncsv_hotel",7,"offers",1,0,0,"tx_irretutorial_1ncsv_offer",10,,,,,
-,"5183f2c97e180a2913ba0c09bd886512","tx_irretutorial_1ncsv_offer",11,"prices",0,0,0,"tx_irretutorial_1ncsv_price",19,,,,,
-,"5c1790fd6e112507d09ad4699805dfd9","tx_irretutorial_1ncsv_hotel",8,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",11,,,,,
-,"51034ddb5328b2ed0f3626f3cbda8ade","tx_irretutorial_1ncsv_offer",12,"prices",0,0,0,"tx_irretutorial_1ncsv_price",20,,,,,
-,"c7887aa73735cb8d3714e5d58b4fab08","tx_irretutorial_1ncsv_hotel",9,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",12,,,,,
-,"7a3de44f6c14001133d2100f2aa6c710","tt_content",299,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",9,,,,,
-,"2226bdb98f58d39ca7435458fe734146","tt_content",300,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",7,,,,,
-,"1757fb94102ca29a681763e1e89565de","tt_content",300,"tx_irretutorial_1ncsv_hotels",1,0,0,"tx_irretutorial_1ncsv_hotel",8,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3,,
+,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4,,
+,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,,
+,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7,,
+,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,,
+,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12,,
+,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,
+,"4c1f01993ed751a775813566b2f9f61e","tx_irretutorial_1ncsv_hotel",7,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",9,,
+,"2823ad9144202733d75318f6ed0b1aa0","tx_irretutorial_1ncsv_hotel",7,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",10,,
+,"5c1790fd6e112507d09ad4699805dfd9","tx_irretutorial_1ncsv_hotel",8,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",11,,
+,"c7887aa73735cb8d3714e5d58b4fab08","tx_irretutorial_1ncsv_hotel",9,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",12,,
+,"bb5a44775aad69cd24228d6076375e42","pages",91,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",6,,
+,"82d25027c994d718124afddeffd4007e","tx_irretutorial_1ncsv_offer",9,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",14,,
+,"10ecd86acc14238ae88bc7534e1def98","tx_irretutorial_1ncsv_offer",9,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",15,,
+,"98b3ed58412b44d6cb723f4908bab398","tx_irretutorial_1ncsv_offer",9,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",16,,
+,"a96df8de72dc29a40a68a56e3e450651","tx_irretutorial_1ncsv_offer",10,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",17,,
+,"c5ae65b6195a3079eb2ccf686ed0bacd","tx_irretutorial_1ncsv_offer",10,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",18,,
+,"5183f2c97e180a2913ba0c09bd886512","tx_irretutorial_1ncsv_offer",11,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",19,,
+,"51034ddb5328b2ed0f3626f3cbda8ade","tx_irretutorial_1ncsv_offer",12,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",20,,
+,"7a3de44f6c14001133d2100f2aa6c710","tt_content",299,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",9,,
+,"2226bdb98f58d39ca7435458fe734146","tt_content",300,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",7,,
+,"1757fb94102ca29a681763e1e89565de","tt_content",300,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",8,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyParentContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyParentContent.csv
index 377fbfa9d04f33258a79713ff21643c9c6bb2695..5e54b58f86cf8c2dfc626517a75d250144fb0148 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyParentContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyParentContent.csv
@@ -1,24 +1,24 @@
-tt_content,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,tx_irretutorial_1ncsv_hotels
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",5
,299,89,128,0,0,0,298,0,0,0,0,0,"Regular Element #2 (copy 1)",6
-tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,offers
+"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,2,89,1,0,0,0,0,0,0,0,0,0,"Hotel #0",
,3,89,256,0,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,0,"Hotel #1",8
,6,89,64,0,0,0,5,0,0,0,0,0,"Hotel #1",9
-tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
+"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
,6,89,128,0,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,0,"Offer #1.1",13
,9,89,32,0,0,0,8,0,0,0,0,0,"Offer #1.1",14
-tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,
+"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,8,89,128,0,0,0,0,0,0,0,0,0,"Price #1.1.2",
,9,89,64,0,0,0,0,0,0,0,0,0,"Price #1.1.3",
@@ -28,7 +28,22 @@ tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
,13,89,4,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,14,89,4,0,0,0,13,0,0,0,0,0,"Price #1.1.1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"82d25027c994d718124afddeffd4007e","tx_irretutorial_1ncsv_offer",9,"prices",0,0,0,"tx_irretutorial_1ncsv_price",14,,,,,
-,"1a8122d5b6f753957e91247a2df13b05","tx_irretutorial_1ncsv_hotel",6,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",9,,,,,
-,"5822ca52c92c38f97af7a3cf2e50afc7","tt_content",299,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",6,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3,,
+,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4,,
+,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,,
+,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7,,
+,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,,
+,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12,,
+,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,
+,"82d25027c994d718124afddeffd4007e","tx_irretutorial_1ncsv_offer",9,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",14,,
+,"1a8122d5b6f753957e91247a2df13b05","tx_irretutorial_1ncsv_hotel",6,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",9,,
+,"5822ca52c92c38f97af7a3cf2e50afc7","tt_content",299,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",6,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyParentContentToDifferentPage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyParentContentToDifferentPage.csv
index 4d1e62b1d8151712acfe87eeb13edc532b412880..07f0847dbec8b214c3ed0cfee86e0597606e5957 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyParentContentToDifferentPage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyParentContentToDifferentPage.csv
@@ -1,30 +1,30 @@
-pages,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,tx_irretutorial_1ncsv_hotels,,
-,1,0,256,0,0,0,0,0,0,0,FunctionalTest,,,
-,88,1,256,0,0,0,0,0,0,0,DataHandlerTest,,,
-,89,88,256,0,0,0,0,0,0,0,Relations,2,,
-,90,88,512,0,0,0,0,0,0,0,Target,,,
-tt_content,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,tx_irretutorial_1ncsv_hotels
+"pages",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","tx_irretutorial_1ncsv_hotels",,
+,1,0,256,0,0,0,0,0,0,0,"FunctionalTest",,,
+,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest",,,
+,89,88,256,0,0,0,0,0,0,0,"Relations",2,,
+,90,88,512,0,0,0,0,0,0,0,"Target",,,
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",5
,299,90,256,0,0,0,298,0,0,0,0,0,"Regular Element #2",6
-tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,offers
+"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,2,89,1,0,0,0,0,0,0,0,0,0,"Hotel #0",
,3,89,256,0,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,0,"Hotel #1",8
,6,90,64,0,0,0,5,0,0,0,0,0,"Hotel #1",9
-tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
+"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
,6,89,128,0,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,0,"Offer #1.1",13
,9,90,32,0,0,0,8,0,0,0,0,0,"Offer #1.1",14
-tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,
+"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,8,89,128,0,0,0,0,0,0,0,0,0,"Price #1.1.2",
,9,89,64,0,0,0,0,0,0,0,0,0,"Price #1.1.3",
@@ -34,7 +34,22 @@ tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
,13,89,4,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,14,90,4,0,0,0,13,0,0,0,0,0,"Price #1.1.1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"82d25027c994d718124afddeffd4007e","tx_irretutorial_1ncsv_offer",9,"prices",0,0,0,"tx_irretutorial_1ncsv_price",14,,,,,
-,"1a8122d5b6f753957e91247a2df13b05","tx_irretutorial_1ncsv_hotel",6,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",9,,,,,
-,"5822ca52c92c38f97af7a3cf2e50afc7","tt_content",299,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",6,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3,,
+,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4,,
+,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,,
+,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7,,
+,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,,
+,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12,,
+,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,
+,"82d25027c994d718124afddeffd4007e","tx_irretutorial_1ncsv_offer",9,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",14,,
+,"1a8122d5b6f753957e91247a2df13b05","tx_irretutorial_1ncsv_hotel",6,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",9,,
+,"5822ca52c92c38f97af7a3cf2e50afc7","tt_content",299,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",6,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyParentContentToLanguage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyParentContentToLanguage.csv
index ec7d1c72682a31ef2daf8684caac1e4dce01e333..e08108f4def6f715cec813b38782df4bd89500bc 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyParentContentToLanguage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/copyParentContentToLanguage.csv
@@ -1,24 +1,24 @@
-tt_content,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,tx_irretutorial_1ncsv_hotels
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",5
,299,89,768,0,1,0,298,0,0,0,0,0,"[Translate to Dansk:] Regular Element #2",6
-tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,offers
+"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,2,89,1,0,0,0,0,0,0,0,0,0,"Hotel #0",
,3,89,256,0,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,0,"Hotel #1",8
,6,89,96,0,1,0,5,0,0,0,0,0,"[Translate to Dansk:] Hotel #1",9
-tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
+"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
,6,89,128,0,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,0,"Offer #1.1",13
,9,89,48,0,1,0,8,0,0,0,0,0,"[Translate to Dansk:] Offer #1.1",14
-tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,
+"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,8,89,128,0,0,0,0,0,0,0,0,0,"Price #1.1.2",
,9,89,64,0,0,0,0,0,0,0,0,0,"Price #1.1.3",
@@ -28,12 +28,27 @@ tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
,13,89,4,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,14,89,6,0,1,0,13,0,0,0,0,0,"[Translate to Dansk:] Price #1.1.1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"ccb9f42691f43cb052dbe5d461d1b6a3","tx_irretutorial_1ncsv_price",14,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"3f199727e51d98f7e00738c7e8c68560","tx_irretutorial_1ncsv_offer",9,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"82d25027c994d718124afddeffd4007e","tx_irretutorial_1ncsv_offer",9,"prices",0,0,0,"tx_irretutorial_1ncsv_price",14,,,,,
-,"b32056cee8022b0baad3e58777756ccb","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"1a8122d5b6f753957e91247a2df13b05","tx_irretutorial_1ncsv_hotel",6,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",9,,,,,
-,"5822ca52c92c38f97af7a3cf2e50afc7","tt_content",299,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",6,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3,,
+,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4,,
+,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,,
+,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7,,
+,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,,
+,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12,,
+,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"ccb9f42691f43cb052dbe5d461d1b6a3","tx_irretutorial_1ncsv_price",14,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"3f199727e51d98f7e00738c7e8c68560","tx_irretutorial_1ncsv_offer",9,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"82d25027c994d718124afddeffd4007e","tx_irretutorial_1ncsv_offer",9,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",14,,
+,"b32056cee8022b0baad3e58777756ccb","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"1a8122d5b6f753957e91247a2df13b05","tx_irretutorial_1ncsv_hotel",6,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",9,,
+,"5822ca52c92c38f97af7a3cf2e50afc7","tt_content",299,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",6,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNCopyParentContentNHotelNOfferChildren.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
index 867dda8e952f94840d0c797f9d32489dd63f2881..ac041c75a3270c0f112a3bf9c1422e252e7edbdc 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
@@ -1,27 +1,27 @@
-tt_content,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,tx_irretutorial_1ncsv_hotels
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",5
,299,89,128,0,0,0,0,0,0,0,0,0,"Testing #1",6
,300,89,64,0,0,0,299,0,0,0,0,0,"Testing #1 (copy 1)",7
-tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,offers
+"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,2,89,1,0,0,0,0,0,0,0,0,0,"Hotel #0",
,3,89,256,0,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,0,"Hotel #1",8
,6,89,0,0,0,0,0,0,0,0,0,0,"Hotel #1",9
,7,89,0,0,0,0,6,0,0,0,0,0,"Hotel #1",10
-tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
+"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
,6,89,128,0,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,0,"Offer #1.1",13
,9,89,16,0,0,0,0,0,0,0,0,0,"Offer #1",
,10,89,16,0,0,0,9,0,0,0,0,0,"Offer #1",
-tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,
+"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,8,89,128,0,0,0,0,0,0,0,0,0,"Price #1.1.2",
,9,89,64,0,0,0,0,0,0,0,0,0,"Price #1.1.3",
@@ -30,8 +30,23 @@ tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
,12,89,8,0,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"5822ca52c92c38f97af7a3cf2e50afc7","tt_content",299,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",6,,,,,
-,"1a8122d5b6f753957e91247a2df13b05","tx_irretutorial_1ncsv_hotel",6,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",9,,,,,
-,"2ddb79c0c533989fd80a071ed6e9a0fe","tx_irretutorial_1ncsv_hotel",7,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",10,,,,,
-,"2226bdb98f58d39ca7435458fe734146","tt_content",300,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",7,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3,,
+,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4,,
+,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,,
+,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7,,
+,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,,
+,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12,,
+,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,
+,"5822ca52c92c38f97af7a3cf2e50afc7","tt_content",299,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",6,,
+,"1a8122d5b6f753957e91247a2df13b05","tx_irretutorial_1ncsv_hotel",6,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",9,,
+,"2ddb79c0c533989fd80a071ed6e9a0fe","tx_irretutorial_1ncsv_hotel",7,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",10,,
+,"2226bdb98f58d39ca7435458fe734146","tt_content",300,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",7,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
index 6383290fd7797fbcfbc1efa572b5137d6e7054a4..8a95b9c3375a65668fd871eff5c5e9be7ac77fae 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
@@ -1,27 +1,27 @@
-tt_content,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,tx_irretutorial_1ncsv_hotels
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",5
,299,89,128,0,0,0,0,0,0,0,0,0,"Testing #1",6
,300,89,192,0,1,299,299,0,0,0,0,0,"[Translate to Dansk:] Testing #1",7
-tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,offers
+"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,2,89,513,0,0,0,0,0,0,0,0,0,"Hotel #0",
,3,89,768,0,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,640,0,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,576,0,0,0,0,0,0,0,0,0,"Hotel #1",8
,6,89,0,0,0,0,0,0,0,0,0,0,"Hotel #1",9
,7,89,256,0,1,6,6,0,0,0,0,0,"[Translate to Dansk:] Hotel #1",10
-tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
+"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
,6,89,128,0,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,0,"Offer #1.1",13
,9,89,16,0,0,0,0,0,0,0,0,0,"Offer #1",
,10,89,24,0,1,9,9,0,0,0,0,0,"[Translate to Dansk:] Offer #1",
-tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,
+"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,8,89,128,0,0,0,0,0,0,0,0,0,"Price #1.1.2",
,9,89,64,0,0,0,0,0,0,0,0,0,"Price #1.1.3",
@@ -30,15 +30,30 @@ tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
,12,89,8,0,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"5822ca52c92c38f97af7a3cf2e50afc7","tt_content",299,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",6,,,,,
-,"1a8122d5b6f753957e91247a2df13b05","tx_irretutorial_1ncsv_hotel",6,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",9,,,,,
-,"b14db21162d88c3a09ccaecb60c56ad9","tx_irretutorial_1ncsv_offer",10,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"75b696d2bcd57240ba76d6b2f243a604","tx_irretutorial_1ncsv_offer",10,"l18n_parent",0,0,0,"tx_irretutorial_1ncsv_offer",9,,,,,
-,"3d99dc85913d2f773fde97f51868e42e","tx_irretutorial_1ncsv_hotel",7,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"e2aa0e5a312636b4569790adb0635363","tx_irretutorial_1ncsv_hotel",7,"l18n_parent",0,0,0,"tx_irretutorial_1ncsv_hotel",6,,,,,
-,"2ddb79c0c533989fd80a071ed6e9a0fe","tx_irretutorial_1ncsv_hotel",7,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",10,,,,,
-,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",0,0,0,"tt_content",299,,,,,
-,"2226bdb98f58d39ca7435458fe734146","tt_content",300,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",7,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3,,
+,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4,,
+,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,,
+,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7,,
+,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,,
+,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12,,
+,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"5822ca52c92c38f97af7a3cf2e50afc7","tt_content",299,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",6,,
+,"1a8122d5b6f753957e91247a2df13b05","tx_irretutorial_1ncsv_hotel",6,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",9,,
+,"b14db21162d88c3a09ccaecb60c56ad9","tx_irretutorial_1ncsv_offer",10,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"75b696d2bcd57240ba76d6b2f243a604","tx_irretutorial_1ncsv_offer",10,"l18n_parent",,,,0,0,0,"tx_irretutorial_1ncsv_offer",9,,
+,"3d99dc85913d2f773fde97f51868e42e","tx_irretutorial_1ncsv_hotel",7,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"e2aa0e5a312636b4569790adb0635363","tx_irretutorial_1ncsv_hotel",7,"l18n_parent",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",6,,
+,"2ddb79c0c533989fd80a071ed6e9a0fe","tx_irretutorial_1ncsv_hotel",7,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",10,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,
+,"2226bdb98f58d39ca7435458fe734146","tt_content",300,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",7,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createParentContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createParentContent.csv
index 9de6e5809be25e431dbc878a2857e7b5b215b8c6..1a31851c1ca24bd1a865e19fc81ddce7157f9f60 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createParentContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createParentContent.csv
@@ -1,7 +1,22 @@
-tt_content,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,tx_irretutorial_1ncsv_hotels
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",5
,299,89,128,0,0,0,0,0,0,0,0,0,"Testing #1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3,,
+,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4,,
+,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,,
+,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7,,
+,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,,
+,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12,,
+,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createParentContentNHotelNOfferChildren.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createParentContentNHotelNOfferChildren.csv
index 4412587694ac4bfeecc074badbfa36e67e60c728..9f8c7b6c15d8eda73e7e88e19c342c7b149d56dd 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/createParentContentNHotelNOfferChildren.csv
@@ -1,24 +1,24 @@
-tt_content,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,tx_irretutorial_1ncsv_hotels
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",5
,299,89,128,0,0,0,0,0,0,0,0,0,"Testing #1",6
-tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,offers
+"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,2,89,1,0,0,0,0,0,0,0,0,0,"Hotel #0",
,3,89,256,0,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,0,"Hotel #1",8
,6,89,0,0,0,0,0,0,0,0,0,0,"Hotel #1",9
-tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
+"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
,6,89,128,0,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,0,"Offer #1.1",13
,9,89,16,0,0,0,0,0,0,0,0,0,"Offer #1",
-tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,
+"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,8,89,128,0,0,0,0,0,0,0,0,0,"Price #1.1.2",
,9,89,64,0,0,0,0,0,0,0,0,0,"Price #1.1.3",
@@ -27,6 +27,21 @@ tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
,12,89,8,0,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"5822ca52c92c38f97af7a3cf2e50afc7","tt_content",299,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",6,,,,,
-,"1a8122d5b6f753957e91247a2df13b05","tx_irretutorial_1ncsv_hotel",6,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",9,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3,,
+,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4,,
+,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,,
+,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7,,
+,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,,
+,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12,,
+,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,
+,"5822ca52c92c38f97af7a3cf2e50afc7","tt_content",299,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",6,,
+,"1a8122d5b6f753957e91247a2df13b05","tx_irretutorial_1ncsv_hotel",6,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",9,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/deletePage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/deletePage.csv
index 271c672cb3227af9a6dfbb3f320c0597b69793cf..099e6d2eb85ca2464ad074498ec2ba8cc58bf288 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/deletePage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/deletePage.csv
@@ -1,27 +1,27 @@
-pages,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,tx_irretutorial_1ncsv_hotels,,
-,1,0,256,0,0,0,0,0,0,0,FunctionalTest,,,
-,88,1,256,0,0,0,0,0,0,0,DataHandlerTest,,,
-,89,88,256,1,0,0,0,0,0,0,Relations,2,,
-,90,88,512,0,0,0,0,0,0,0,Target,,,
-tt_content,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,tx_irretutorial_1ncsv_hotels
+"pages",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","tx_irretutorial_1ncsv_hotels",,
+,1,0,256,0,0,0,0,0,0,0,"FunctionalTest",,,
+,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest",,,
+,89,88,256,1,0,0,0,0,0,0,"Relations",2,,
+,90,88,512,0,0,0,0,0,0,0,"Target",,,
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
,297,89,256,1,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,1,0,0,0,0,0,0,0,0,"Regular Element #2",5
-tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,offers
+"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,2,89,1,1,0,0,0,0,0,0,0,0,"Hotel #0",
,3,89,256,1,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,1,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,1,0,0,0,0,0,0,0,0,"Hotel #1",8
-tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
+"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,1,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
,6,89,128,1,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,1,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,1,0,0,0,0,0,0,0,0,"Offer #1.1",13
-tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,
+"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,1,0,0,0,0,0,0,0,0,"Price #1.1.1",
,8,89,128,1,0,0,0,0,0,0,0,0,"Price #1.1.2",
,9,89,64,1,0,0,0,0,0,0,0,0,"Price #1.1.3",
@@ -30,19 +30,19 @@ tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
,12,89,8,1,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,1,0,0,0,0,0,0,0,0,"Price #1.1.1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"1e657b7d5a025d25ed502694bbc000a3","tx_irretutorial_1ncsv_offer",5,"prices",0,1,0,"tx_irretutorial_1ncsv_price",7,,,,,
-,"d8800763315a79d6116691696f56751a","tx_irretutorial_1ncsv_offer",5,"prices",1,1,0,"tx_irretutorial_1ncsv_price",8,,,,,
-,"6a2b7b15e9fa09129e582a8ebe31160c","tx_irretutorial_1ncsv_offer",5,"prices",2,1,0,"tx_irretutorial_1ncsv_price",9,,,,,
-,"c5b92b43108b9de724acb3b2cf20d2f5","tx_irretutorial_1ncsv_offer",6,"prices",0,1,0,"tx_irretutorial_1ncsv_price",10,,,,,
-,"7c5dd5a752ab87e35e9c8bcae161f70a","tx_irretutorial_1ncsv_offer",6,"prices",1,1,0,"tx_irretutorial_1ncsv_price",11,,,,,
-,"6a0e58af0833389ce9c517fb1a88eafa","tx_irretutorial_1ncsv_hotel",3,"offers",0,1,0,"tx_irretutorial_1ncsv_offer",5,,,,,
-,"018fa41d8f70e83547ddf309b4817069","tx_irretutorial_1ncsv_hotel",3,"offers",1,1,0,"tx_irretutorial_1ncsv_offer",6,,,,,
-,"99c522a367159f97706e6e255b2cd701","tx_irretutorial_1ncsv_offer",7,"prices",0,1,0,"tx_irretutorial_1ncsv_price",12,,,,,
-,"b5aec3780d4d441b3c3a9511421016e8","tx_irretutorial_1ncsv_hotel",4,"offers",0,1,0,"tx_irretutorial_1ncsv_offer",7,,,,,
-,"e07c2b913a15f97a696f3214c197b028","tt_content",297,"tx_irretutorial_1ncsv_hotels",0,1,0,"tx_irretutorial_1ncsv_hotel",3,,,,,
-,"261e5c7da98680813898f45fc2f70541","tt_content",297,"tx_irretutorial_1ncsv_hotels",1,1,0,"tx_irretutorial_1ncsv_hotel",4,,,,,
-,"dd79ff8643d620ed5ee537ba1e7393c3","tx_irretutorial_1ncsv_offer",8,"prices",0,1,0,"tx_irretutorial_1ncsv_price",13,,,,,
-,"096f8b08d3c6fa0c0ce946607707a07f","tx_irretutorial_1ncsv_hotel",5,"offers",0,1,0,"tx_irretutorial_1ncsv_offer",8,,,,,
-,"16f1e8f366b6ffcfcdef525e9fc0c693","tt_content",298,"tx_irretutorial_1ncsv_hotels",0,1,0,"tx_irretutorial_1ncsv_hotel",5,,,,,
-,"19502a19e229c6ebd0706c4368ff4b17","pages",89,"tx_irretutorial_1ncsv_hotels",0,1,0,"tx_irretutorial_1ncsv_hotel",2,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"1e657b7d5a025d25ed502694bbc000a3","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,1,0,"tx_irretutorial_1ncsv_price",7,,
+,"d8800763315a79d6116691696f56751a","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,1,0,"tx_irretutorial_1ncsv_price",8,,
+,"6a2b7b15e9fa09129e582a8ebe31160c","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,1,0,"tx_irretutorial_1ncsv_price",9,,
+,"c5b92b43108b9de724acb3b2cf20d2f5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,1,0,"tx_irretutorial_1ncsv_price",10,,
+,"7c5dd5a752ab87e35e9c8bcae161f70a","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,1,0,"tx_irretutorial_1ncsv_price",11,,
+,"99c522a367159f97706e6e255b2cd701","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,1,0,"tx_irretutorial_1ncsv_price",12,,
+,"dd79ff8643d620ed5ee537ba1e7393c3","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,1,0,"tx_irretutorial_1ncsv_price",13,,
+,"6a0e58af0833389ce9c517fb1a88eafa","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,1,0,"tx_irretutorial_1ncsv_offer",5,,
+,"018fa41d8f70e83547ddf309b4817069","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,1,0,"tx_irretutorial_1ncsv_offer",6,,
+,"b5aec3780d4d441b3c3a9511421016e8","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,1,0,"tx_irretutorial_1ncsv_offer",7,,
+,"096f8b08d3c6fa0c0ce946607707a07f","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,1,0,"tx_irretutorial_1ncsv_offer",8,,
+,"e07c2b913a15f97a696f3214c197b028","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,1,0,"tx_irretutorial_1ncsv_hotel",3,,
+,"261e5c7da98680813898f45fc2f70541","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,1,0,"tx_irretutorial_1ncsv_hotel",4,,
+,"16f1e8f366b6ffcfcdef525e9fc0c693","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,1,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"19502a19e229c6ebd0706c4368ff4b17","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,1,0,"tx_irretutorial_1ncsv_hotel",2,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/deleteParentContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/deleteParentContent.csv
index d9ab1eee98480b13f63f46032789eede7aa0ac5a..4ffa73a6c74af9c8f09ee636165d6d2201c7e99c 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/deleteParentContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/deleteParentContent.csv
@@ -1,21 +1,21 @@
-tt_content,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,tx_irretutorial_1ncsv_hotels
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,1,0,0,0,0,0,0,0,0,"Regular Element #2",5
-tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,offers
+"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,2,89,1,0,0,0,0,0,0,0,0,0,"Hotel #0",
,3,89,256,0,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,1,0,0,0,0,0,0,0,0,"Hotel #1",8
-tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
+"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
,6,89,128,0,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,1,0,0,0,0,0,0,0,0,"Offer #1.1",13
-tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,
+"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,8,89,128,0,0,0,0,0,0,0,0,0,"Price #1.1.2",
,9,89,64,0,0,0,0,0,0,0,0,0,"Price #1.1.3",
@@ -24,7 +24,19 @@ tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
,12,89,8,0,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,1,0,0,0,0,0,0,0,0,"Price #1.1.1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"dd79ff8643d620ed5ee537ba1e7393c3","tx_irretutorial_1ncsv_offer",8,"prices",0,1,0,"tx_irretutorial_1ncsv_price",13,,,,,
-,"096f8b08d3c6fa0c0ce946607707a07f","tx_irretutorial_1ncsv_hotel",5,"offers",0,1,0,"tx_irretutorial_1ncsv_offer",8,,,,,
-,"16f1e8f366b6ffcfcdef525e9fc0c693","tt_content",298,"tx_irretutorial_1ncsv_hotels",0,1,0,"tx_irretutorial_1ncsv_hotel",5,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3,,
+,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4,,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,,
+,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7,,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,,
+,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12,,
+,"dd79ff8643d620ed5ee537ba1e7393c3","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,1,0,"tx_irretutorial_1ncsv_price",13,,
+,"096f8b08d3c6fa0c0ce946607707a07f","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,1,0,"tx_irretutorial_1ncsv_offer",8,,
+,"16f1e8f366b6ffcfcdef525e9fc0c693","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,1,0,"tx_irretutorial_1ncsv_hotel",5,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeNCopyPageWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeNCopyPageWSynchronization.csv
index 177a66c0692435c7d9fd8cbb29b06d0f63589d18..4810a1d8fe40fffdb95d781ba5170f7623ce1799 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeNCopyPageWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeNCopyPageWSynchronization.csv
@@ -1,20 +1,20 @@
-pages,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,tx_irretutorial_1ncsv_hotels,,
-,1,0,256,0,0,0,0,0,0,0,FunctionalTest,,,
-,88,1,256,0,0,0,0,0,0,0,DataHandlerTest,,,
-,89,88,256,0,0,0,0,0,0,0,Relations,2,,
-,90,88,512,0,0,0,0,0,0,0,Target,,,
+"pages",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","tx_irretutorial_1ncsv_hotels",,
+,1,0,256,0,0,0,0,0,0,0,"FunctionalTest",,,
+,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest",,,
+,89,88,256,0,0,0,0,0,0,0,"Relations",2,,
+,90,88,512,0,0,0,0,0,0,0,"Target",,,
,91,88,256,0,0,0,0,0,0,0,"[Translate to Dansk:] Relations",6,,
-,92,90,256,0,89,0,0,0,0,0,Relations,7,,
+,92,90,256,0,89,0,0,0,0,0,"Relations",7,,
,93,90,256,0,91,0,0,0,0,0,"[Translate to Dansk:] Relations",8,,
-tt_content,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,tx_irretutorial_1ncsv_hotels
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",5
,299,92,256,0,0,0,298,0,0,0,0,0,"Regular Element #2",9
,300,92,128,0,0,0,297,0,0,0,0,0,"Regular Element #1","10,11"
-tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,offers
+"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,2,89,1,0,0,0,0,0,0,0,0,0,"Hotel #0",
,3,89,256,0,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,0,"Hotel #2",7
@@ -25,8 +25,8 @@ tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
,9,92,64,0,0,0,5,0,0,0,0,0,"Hotel #1",9
,10,92,256,0,0,0,3,0,0,0,0,0,"Hotel #1","10,11"
,11,92,128,0,0,0,4,0,0,0,0,0,"Hotel #2",12
-tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
+"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
,6,89,128,0,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,0,"Offer #2.1",12
@@ -35,8 +35,8 @@ tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
,10,92,256,0,0,0,5,0,0,0,0,0,"Offer #1.1","15,16,17"
,11,92,128,0,0,0,6,0,0,0,0,0,"Offer #1.2","18,19"
,12,92,64,0,0,0,7,0,0,0,0,0,"Offer #2.1",20
-tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,
+"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,8,89,128,0,0,0,0,0,0,0,0,0,"Price #1.1.2",
,9,89,64,0,0,0,0,0,0,0,0,0,"Price #1.1.3",
@@ -52,29 +52,44 @@ tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
,19,92,16,0,0,0,11,0,0,0,0,0,"Price #1.2.2",
,20,92,8,0,0,0,12,0,0,0,0,0,"Price #2.1.1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"b32056cee8022b0baad3e58777756ccb","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"3f20e3df48945370654d7dfc508e1d36","tx_irretutorial_1ncsv_hotel",6,"l18n_parent",0,0,0,"tx_irretutorial_1ncsv_hotel",2,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"bb5a44775aad69cd24228d6076375e42","pages",91,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",6,,,,,
-,"c8dd7216c586b7653713125f2b2f326e","pages",92,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",7,,,,,
-,"d21577d8823354284457e79284817fd5","tx_irretutorial_1ncsv_hotel",8,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"d0bc06b71f765fd230f63a9dc847c7fe","pages",93,"l10n_parent",0,0,0,"pages",92,,,,,
-,"2376b105383bdfe30bf66df5d704a7be","pages",93,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"7f6eee3d446a990075476c2685f5580c","pages",93,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",8,,,,,
-,"82d25027c994d718124afddeffd4007e","tx_irretutorial_1ncsv_offer",9,"prices",0,0,0,"tx_irretutorial_1ncsv_price",14,,,,,
-,"84e423f1228e2c6973a76c9732345ec3","tx_irretutorial_1ncsv_hotel",9,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",9,,,,,
-,"7a3de44f6c14001133d2100f2aa6c710","tt_content",299,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",9,,,,,
-,"49d52f16f30e90291550540de0ce765a","tx_irretutorial_1ncsv_offer",10,"prices",0,0,0,"tx_irretutorial_1ncsv_price",15,,,,,
-,"9aaf2d982e90a818d8389bf1b09225b9","tx_irretutorial_1ncsv_offer",10,"prices",1,0,0,"tx_irretutorial_1ncsv_price",16,,,,,
-,"3bbaa3c6ddf521ad177d3eaf30b7f2d5","tx_irretutorial_1ncsv_offer",10,"prices",2,0,0,"tx_irretutorial_1ncsv_price",17,,,,,
-,"df8555f2f4d2386cd83a3089754bc539","tx_irretutorial_1ncsv_offer",11,"prices",0,0,0,"tx_irretutorial_1ncsv_price",18,,,,,
-,"4772a452921cf36230f825af577142f1","tx_irretutorial_1ncsv_offer",11,"prices",1,0,0,"tx_irretutorial_1ncsv_price",19,,,,,
-,"b68413d9e45485f9ecd0a6ddae96ffda","tx_irretutorial_1ncsv_hotel",10,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",10,,,,,
-,"d72055ec6e646cbec5f0407bea653109","tx_irretutorial_1ncsv_hotel",10,"offers",1,0,0,"tx_irretutorial_1ncsv_offer",11,,,,,
-,"51034ddb5328b2ed0f3626f3cbda8ade","tx_irretutorial_1ncsv_offer",12,"prices",0,0,0,"tx_irretutorial_1ncsv_price",20,,,,,
-,"31a770fb52c88d5c655a4790ab99332a","tx_irretutorial_1ncsv_hotel",11,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",12,,,,,
-,"77c07cef6a6ef9399b97094caccd0061","tt_content",300,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",10,,,,,
-,"fabd474001e3aa1445b87945ea5e909f","tt_content",300,"tx_irretutorial_1ncsv_hotels",1,0,0,"tx_irretutorial_1ncsv_hotel",11,,,,,
-,"207fcbad164fca2c961bd271a5bf98d8","tx_irretutorial_1ncsv_hotel",8,"l18n_parent",0,0,0,"tx_irretutorial_1ncsv_hotel",7,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3,,
+,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4,,
+,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,,
+,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7,,
+,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,,
+,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12,,
+,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,
+,"b32056cee8022b0baad3e58777756ccb","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"3f20e3df48945370654d7dfc508e1d36","tx_irretutorial_1ncsv_hotel",6,"l18n_parent",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"bb5a44775aad69cd24228d6076375e42","pages",91,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",6,,
+,"d21577d8823354284457e79284817fd5","tx_irretutorial_1ncsv_hotel",8,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"207fcbad164fca2c961bd271a5bf98d8","tx_irretutorial_1ncsv_hotel",8,"l18n_parent",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",7,,
+,"84e423f1228e2c6973a76c9732345ec3","tx_irretutorial_1ncsv_hotel",9,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",9,,
+,"b68413d9e45485f9ecd0a6ddae96ffda","tx_irretutorial_1ncsv_hotel",10,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",10,,
+,"d72055ec6e646cbec5f0407bea653109","tx_irretutorial_1ncsv_hotel",10,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",11,,
+,"31a770fb52c88d5c655a4790ab99332a","tx_irretutorial_1ncsv_hotel",11,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",12,,
+,"c8dd7216c586b7653713125f2b2f326e","pages",92,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",7,,
+,"d0bc06b71f765fd230f63a9dc847c7fe","pages",93,"l10n_parent",,,,0,0,0,"pages",92,,
+,"2376b105383bdfe30bf66df5d704a7be","pages",93,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"7f6eee3d446a990075476c2685f5580c","pages",93,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",8,,
+,"82d25027c994d718124afddeffd4007e","tx_irretutorial_1ncsv_offer",9,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",14,,
+,"49d52f16f30e90291550540de0ce765a","tx_irretutorial_1ncsv_offer",10,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",15,,
+,"9aaf2d982e90a818d8389bf1b09225b9","tx_irretutorial_1ncsv_offer",10,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",16,,
+,"3bbaa3c6ddf521ad177d3eaf30b7f2d5","tx_irretutorial_1ncsv_offer",10,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",17,,
+,"df8555f2f4d2386cd83a3089754bc539","tx_irretutorial_1ncsv_offer",11,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",18,,
+,"4772a452921cf36230f825af577142f1","tx_irretutorial_1ncsv_offer",11,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",19,,
+,"51034ddb5328b2ed0f3626f3cbda8ade","tx_irretutorial_1ncsv_offer",12,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",20,,
+,"7a3de44f6c14001133d2100f2aa6c710","tt_content",299,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",9,,
+,"77c07cef6a6ef9399b97094caccd0061","tt_content",300,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",10,,
+,"fabd474001e3aa1445b87945ea5e909f","tt_content",300,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",11,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageAddMonoglotHotelChildNCopyPageWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageAddMonoglotHotelChildNCopyPageWSynchronization.csv
index 5f5e944bf72e984a27334aff9e95f0f48706bf7f..e4f88ef66f4f8759b90f5ce009e4f63af6f1ae70 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageAddMonoglotHotelChildNCopyPageWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageAddMonoglotHotelChildNCopyPageWSynchronization.csv
@@ -1,20 +1,20 @@
-pages,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,tx_irretutorial_1ncsv_hotels,,
-,1,0,256,0,0,0,0,0,0,0,FunctionalTest,,,
-,88,1,256,0,0,0,0,0,0,0,DataHandlerTest,,,
-,89,88,256,0,0,0,0,0,0,0,Relations,"2,7",,
-,90,88,512,0,0,0,0,0,0,0,Target,,,
+"pages",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","tx_irretutorial_1ncsv_hotels",,
+,1,0,256,0,0,0,0,0,0,0,"FunctionalTest",,,
+,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest",,,
+,89,88,256,0,0,0,0,0,0,0,"Relations","2,7",,
+,90,88,512,0,0,0,0,0,0,0,"Target",,,
,91,88,256,0,0,0,0,0,0,0,"[Translate to Dansk:] Relations","6,8",,
-,92,90,256,0,89,0,0,0,0,0,Relations,"9,10",,
+,92,90,256,0,89,0,0,0,0,0,"Relations","9,10",,
,93,90,256,0,91,0,0,0,0,0,"[Translate to Dansk:] Relations","11,12",,
-tt_content,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,tx_irretutorial_1ncsv_hotels
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",5
,299,92,256,0,0,0,298,0,0,0,0,0,"Regular Element #2",13
,300,92,128,0,0,0,297,0,0,0,0,0,"Regular Element #1","14,15"
-tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,offers
+"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,2,89,513,0,0,0,0,0,0,0,0,0,"Hotel #0",
,3,89,768,0,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,640,0,0,0,0,0,0,0,0,0,"Hotel #2",7
@@ -29,8 +29,8 @@ tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
,13,92,576,0,0,0,5,0,0,0,0,0,"Hotel #1",9
,14,92,768,0,0,0,3,0,0,0,0,0,"Hotel #1","10,11"
,15,92,640,0,0,0,4,0,0,0,0,0,"Hotel #2",12
-tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
+"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
,6,89,128,0,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,0,"Offer #2.1",12
@@ -39,8 +39,8 @@ tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
,10,92,256,0,0,0,5,0,0,0,0,0,"Offer #1.1","15,16,17"
,11,92,128,0,0,0,6,0,0,0,0,0,"Offer #1.2","18,19"
,12,92,64,0,0,0,7,0,0,0,0,0,"Offer #2.1",20
-tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,
+"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,8,89,128,0,0,0,0,0,0,0,0,0,"Price #1.1.2",
,9,89,64,0,0,0,0,0,0,0,0,0,"Price #1.1.3",
@@ -56,30 +56,44 @@ tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
,19,92,16,0,0,0,11,0,0,0,0,0,"Price #1.2.2",
,20,92,8,0,0,0,12,0,0,0,0,0,"Price #2.1.1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"bb5a44775aad69cd24228d6076375e42","pages",91,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",6,,,,,
-,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",2,,,,,
-,"e977e77558d5a04292e8e8a236f00bcc","pages",89,"tx_irretutorial_1ncsv_hotels",1,0,0,"tx_irretutorial_1ncsv_hotel",7,,,,,
-,"2db63f17016e4a1f79d92b666d11e05b","pages",91,"tx_irretutorial_1ncsv_hotels",1,0,0,"tx_irretutorial_1ncsv_hotel",8,,,,,
-,"5535cfd6ea3d95ef2fa672c2e5338af0","pages",92,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",9,,,,,
-,"3c7c39bd3c23a7f428991f184128a080","pages",92,"tx_irretutorial_1ncsv_hotels",1,0,0,"tx_irretutorial_1ncsv_hotel",10,,,,,
-,"d0bc06b71f765fd230f63a9dc847c7fe","pages",93,"l10n_parent",0,0,0,"pages",92,,,,,
-,"2376b105383bdfe30bf66df5d704a7be","pages",93,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"e5d0b61c0e4dce1cb241d0dfbba5715c","pages",93,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",11,,,,,
-,"26f1916f8343fb6d12ef10da2b016355","pages",93,"tx_irretutorial_1ncsv_hotels",1,0,0,"tx_irretutorial_1ncsv_hotel",12,,,,,
-,"82d25027c994d718124afddeffd4007e","tx_irretutorial_1ncsv_offer",9,"prices",0,0,0,"tx_irretutorial_1ncsv_price",14,,,,,
-,"50ef694018aca0d6b520eb180a011c19","tx_irretutorial_1ncsv_hotel",13,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",9,,,,,
-,"3e84748e25250ff0289cbb990edc5b04","tt_content",299,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",13,,,,,
-,"49d52f16f30e90291550540de0ce765a","tx_irretutorial_1ncsv_offer",10,"prices",0,0,0,"tx_irretutorial_1ncsv_price",15,,,,,
-,"9aaf2d982e90a818d8389bf1b09225b9","tx_irretutorial_1ncsv_offer",10,"prices",1,0,0,"tx_irretutorial_1ncsv_price",16,,,,,
-,"3bbaa3c6ddf521ad177d3eaf30b7f2d5","tx_irretutorial_1ncsv_offer",10,"prices",2,0,0,"tx_irretutorial_1ncsv_price",17,,,,,
-,"df8555f2f4d2386cd83a3089754bc539","tx_irretutorial_1ncsv_offer",11,"prices",0,0,0,"tx_irretutorial_1ncsv_price",18,,,,,
-,"4772a452921cf36230f825af577142f1","tx_irretutorial_1ncsv_offer",11,"prices",1,0,0,"tx_irretutorial_1ncsv_price",19,,,,,
-,"1aecfb7c9cd5b3c80687a295cb412300","tx_irretutorial_1ncsv_hotel",14,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",10,,,,,
-,"ecd65fc9ba76a2e8a539e6695d362b97","tx_irretutorial_1ncsv_hotel",14,"offers",1,0,0,"tx_irretutorial_1ncsv_offer",11,,,,,
-,"51034ddb5328b2ed0f3626f3cbda8ade","tx_irretutorial_1ncsv_offer",12,"prices",0,0,0,"tx_irretutorial_1ncsv_price",20,,,,,
-,"48a1de1ed069754fd4f39776fb0b1362","tx_irretutorial_1ncsv_hotel",15,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",12,,,,,
-,"528e8cdc7e109120403d96b46af1fd4d","tt_content",300,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",14,,,,,
-,"a7ad2c4a1bbb3d392b23b232c6ac9ab8","tt_content",300,"tx_irretutorial_1ncsv_hotels",1,0,0,"tx_irretutorial_1ncsv_hotel",15,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3,,
+,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4,,
+,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,,
+,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7,,
+,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,,
+,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12,,
+,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"bb5a44775aad69cd24228d6076375e42","pages",91,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",6,,
+,"e977e77558d5a04292e8e8a236f00bcc","pages",89,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",7,,
+,"2db63f17016e4a1f79d92b666d11e05b","pages",91,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",8,,
+,"50ef694018aca0d6b520eb180a011c19","tx_irretutorial_1ncsv_hotel",13,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",9,,
+,"1aecfb7c9cd5b3c80687a295cb412300","tx_irretutorial_1ncsv_hotel",14,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",10,,
+,"ecd65fc9ba76a2e8a539e6695d362b97","tx_irretutorial_1ncsv_hotel",14,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",11,,
+,"48a1de1ed069754fd4f39776fb0b1362","tx_irretutorial_1ncsv_hotel",15,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",12,,
+,"5535cfd6ea3d95ef2fa672c2e5338af0","pages",92,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",9,,
+,"3c7c39bd3c23a7f428991f184128a080","pages",92,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",10,,
+,"d0bc06b71f765fd230f63a9dc847c7fe","pages",93,"l10n_parent",,,,0,0,0,"pages",92,,
+,"2376b105383bdfe30bf66df5d704a7be","pages",93,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"e5d0b61c0e4dce1cb241d0dfbba5715c","pages",93,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",11,,
+,"26f1916f8343fb6d12ef10da2b016355","pages",93,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",12,,
+,"82d25027c994d718124afddeffd4007e","tx_irretutorial_1ncsv_offer",9,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",14,,
+,"49d52f16f30e90291550540de0ce765a","tx_irretutorial_1ncsv_offer",10,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",15,,
+,"9aaf2d982e90a818d8389bf1b09225b9","tx_irretutorial_1ncsv_offer",10,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",16,,
+,"3bbaa3c6ddf521ad177d3eaf30b7f2d5","tx_irretutorial_1ncsv_offer",10,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",17,,
+,"df8555f2f4d2386cd83a3089754bc539","tx_irretutorial_1ncsv_offer",11,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",18,,
+,"4772a452921cf36230f825af577142f1","tx_irretutorial_1ncsv_offer",11,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",19,,
+,"51034ddb5328b2ed0f3626f3cbda8ade","tx_irretutorial_1ncsv_offer",12,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",20,,
+,"3e84748e25250ff0289cbb990edc5b04","tt_content",299,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",13,,
+,"528e8cdc7e109120403d96b46af1fd4d","tt_content",300,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",14,,
+,"a7ad2c4a1bbb3d392b23b232c6ac9ab8","tt_content",300,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",15,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageNAddHotelChildWExclude.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageNAddHotelChildWExclude.csv
index f8b806e0e54ab6df59292d29cb96065f2bbd4156..a5ef04adc41d44ddd36d6c32b5cd0e1df0c6e8c2 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageNAddHotelChildWExclude.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageNAddHotelChildWExclude.csv
@@ -1,16 +1,16 @@
-pages,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,tx_irretutorial_1ncsv_hotels,,
-,1,0,256,0,0,0,0,0,0,0,FunctionalTest,,,
-,88,1,256,0,0,0,0,0,0,0,DataHandlerTest,,,
-,89,88,256,0,0,0,0,0,0,0,Relations,"2,7",,
-,90,88,512,0,0,0,0,0,0,0,Target,,,
+"pages",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","tx_irretutorial_1ncsv_hotels",,
+,1,0,256,0,0,0,0,0,0,0,"FunctionalTest",,,
+,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest",,,
+,89,88,256,0,0,0,0,0,0,0,"Relations","2,7",,
+,90,88,512,0,0,0,0,0,0,0,"Target",,,
,91,88,256,0,0,0,0,0,0,0,"[Translate to Dansk:] Relations","6,8",,
-tt_content,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,tx_irretutorial_1ncsv_hotels
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",5
-tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,offers
+"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,2,89,513,0,0,0,0,0,0,0,0,0,"Hotel #0",
,3,89,768,0,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,640,0,0,0,0,0,0,0,0,0,"Hotel #2",7
@@ -18,14 +18,14 @@ tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
,6,89,544,0,1,2,2,0,0,0,0,0,"Hotel #0",
,7,89,512,0,0,0,0,0,0,0,0,0,"Hotel #007",
,8,89,256,0,1,7,0,0,0,0,0,0,"Hotel #007",
-tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
+"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
,6,89,128,0,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,0,"Offer #1.1",13
-tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,
+"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,8,89,128,0,0,0,0,0,0,0,0,0,"Price #1.1.2",
,9,89,64,0,0,0,0,0,0,0,0,0,"Price #1.1.3",
@@ -34,14 +34,28 @@ tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
,12,89,8,0,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"b32056cee8022b0baad3e58777756ccb","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"3f20e3df48945370654d7dfc508e1d36","tx_irretutorial_1ncsv_hotel",6,"l18n_parent",0,0,0,"tx_irretutorial_1ncsv_hotel",2,,,,,
-,"bb5a44775aad69cd24228d6076375e42","pages",91,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",6,,,,,
-,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",2,,,,,
-,"d21577d8823354284457e79284817fd5","tx_irretutorial_1ncsv_hotel",8,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"e977e77558d5a04292e8e8a236f00bcc","pages",89,"tx_irretutorial_1ncsv_hotels",1,0,0,"tx_irretutorial_1ncsv_hotel",7,,,,,
-,"2db63f17016e4a1f79d92b666d11e05b","pages",91,"tx_irretutorial_1ncsv_hotels",1,0,0,"tx_irretutorial_1ncsv_hotel",8,,,,,
-,"207fcbad164fca2c961bd271a5bf98d8","tx_irretutorial_1ncsv_hotel",8,"l18n_parent",0,0,0,"tx_irretutorial_1ncsv_hotel",7,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3,,
+,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4,,
+,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,,
+,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7,,
+,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,,
+,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12,,
+,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,
+,"b32056cee8022b0baad3e58777756ccb","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"3f20e3df48945370654d7dfc508e1d36","tx_irretutorial_1ncsv_hotel",6,"l18n_parent",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"bb5a44775aad69cd24228d6076375e42","pages",91,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",6,,
+,"e977e77558d5a04292e8e8a236f00bcc","pages",89,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",7,,
+,"2db63f17016e4a1f79d92b666d11e05b","pages",91,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",8,,
+,"d21577d8823354284457e79284817fd5","tx_irretutorial_1ncsv_hotel",8,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"207fcbad164fca2c961bd271a5bf98d8","tx_irretutorial_1ncsv_hotel",8,"l18n_parent",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",7,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageNAddHotelChildWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageNAddHotelChildWSynchronization.csv
index cc8ca3de12e3bb59a9efb9326d149d5020ca2346..8735c21de074d4b2396be1979bf9c55bf0c19eee 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageNAddHotelChildWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageNAddHotelChildWSynchronization.csv
@@ -1,16 +1,16 @@
-pages,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,tx_irretutorial_1ncsv_hotels,,
-,1,0,256,0,0,0,0,0,0,0,FunctionalTest,,,
-,88,1,256,0,0,0,0,0,0,0,DataHandlerTest,,,
-,89,88,256,0,0,0,0,0,0,0,Relations,"2,7",,
-,90,88,512,0,0,0,0,0,0,0,Target,,,
+"pages",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","tx_irretutorial_1ncsv_hotels",,
+,1,0,256,0,0,0,0,0,0,0,"FunctionalTest",,,
+,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest",,,
+,89,88,256,0,0,0,0,0,0,0,"Relations","2,7",,
+,90,88,512,0,0,0,0,0,0,0,"Target",,,
,91,88,256,0,0,0,0,0,0,0,"[Translate to Dansk:] Relations","6,8",,
-tt_content,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,tx_irretutorial_1ncsv_hotels
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",5
-tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,offers
+"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,2,89,513,0,0,0,0,0,0,0,0,0,"Hotel #0",
,3,89,768,0,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,640,0,0,0,0,0,0,0,0,0,"Hotel #2",7
@@ -18,14 +18,14 @@ tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
,6,89,544,0,1,2,2,0,0,0,0,0,"[Translate to Dansk:] Hotel #0",
,7,89,512,0,0,0,0,0,0,0,0,0,"Hotel #007",
,8,89,256,0,1,7,0,0,0,0,0,0,"[Translate to Dansk:] Hotel #007",
-tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
+"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
,6,89,128,0,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,0,"Offer #1.1",13
-tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,
+"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,8,89,128,0,0,0,0,0,0,0,0,0,"Price #1.1.2",
,9,89,64,0,0,0,0,0,0,0,0,0,"Price #1.1.3",
@@ -34,14 +34,28 @@ tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
,12,89,8,0,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"b32056cee8022b0baad3e58777756ccb","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"3f20e3df48945370654d7dfc508e1d36","tx_irretutorial_1ncsv_hotel",6,"l18n_parent",0,0,0,"tx_irretutorial_1ncsv_hotel",2,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"bb5a44775aad69cd24228d6076375e42","pages",91,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",6,,,,,
-,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",2,,,,,
-,"d21577d8823354284457e79284817fd5","tx_irretutorial_1ncsv_hotel",8,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"e977e77558d5a04292e8e8a236f00bcc","pages",89,"tx_irretutorial_1ncsv_hotels",1,0,0,"tx_irretutorial_1ncsv_hotel",7,,,,,
-,"2db63f17016e4a1f79d92b666d11e05b","pages",91,"tx_irretutorial_1ncsv_hotels",1,0,0,"tx_irretutorial_1ncsv_hotel",8,,,,,
-,"207fcbad164fca2c961bd271a5bf98d8","tx_irretutorial_1ncsv_hotel",8,"l18n_parent",0,0,0,"tx_irretutorial_1ncsv_hotel",7,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3,,
+,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4,,
+,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,,
+,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7,,
+,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,,
+,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12,,
+,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,
+,"b32056cee8022b0baad3e58777756ccb","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"3f20e3df48945370654d7dfc508e1d36","tx_irretutorial_1ncsv_hotel",6,"l18n_parent",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"bb5a44775aad69cd24228d6076375e42","pages",91,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",6,,
+,"e977e77558d5a04292e8e8a236f00bcc","pages",89,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",7,,
+,"2db63f17016e4a1f79d92b666d11e05b","pages",91,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",8,,
+,"d21577d8823354284457e79284817fd5","tx_irretutorial_1ncsv_hotel",8,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"207fcbad164fca2c961bd271a5bf98d8","tx_irretutorial_1ncsv_hotel",8,"l18n_parent",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",7,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageNAddMonoglotHotelChildWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageNAddMonoglotHotelChildWSynchronization.csv
index fc0124b931f69e51a55f8694521f6975d1cf388c..6e4fc6724ab462978507c59637b6bd6f02513afa 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageNAddMonoglotHotelChildWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageNAddMonoglotHotelChildWSynchronization.csv
@@ -1,16 +1,16 @@
-pages,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,tx_irretutorial_1ncsv_hotels,,
-,1,0,256,0,0,0,0,0,0,0,FunctionalTest,,,
-,88,1,256,0,0,0,0,0,0,0,DataHandlerTest,,,
-,89,88,256,0,0,0,0,0,0,0,Relations,"2,7",,
-,90,88,512,0,0,0,0,0,0,0,Target,,,
+"pages",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","tx_irretutorial_1ncsv_hotels",,
+,1,0,256,0,0,0,0,0,0,0,"FunctionalTest",,,
+,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest",,,
+,89,88,256,0,0,0,0,0,0,0,"Relations","2,7",,
+,90,88,512,0,0,0,0,0,0,0,"Target",,,
,91,88,256,0,0,0,0,0,0,0,"[Translate to Dansk:] Relations","6,8",,
-tt_content,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,tx_irretutorial_1ncsv_hotels
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",5
-tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,offers
+"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,2,89,513,0,0,0,0,0,0,0,0,0,"Hotel #0",
,3,89,768,0,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,640,0,0,0,0,0,0,0,0,0,"Hotel #2",7
@@ -18,14 +18,14 @@ tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
,6,89,544,0,0,0,2,0,0,0,0,0,"Hotel #0",
,7,89,512,0,0,0,0,0,0,0,0,0,"Hotel #007",
,8,89,256,0,0,0,0,0,0,0,0,0,"Hotel #007",
-tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
+"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
,6,89,128,0,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,0,"Offer #1.1",13
-tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,
+"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,8,89,128,0,0,0,0,0,0,0,0,0,"Price #1.1.2",
,9,89,64,0,0,0,0,0,0,0,0,0,"Price #1.1.3",
@@ -34,10 +34,24 @@ tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
,12,89,8,0,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"bb5a44775aad69cd24228d6076375e42","pages",91,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",6,,,,,
-,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",2,,,,,
-,"e977e77558d5a04292e8e8a236f00bcc","pages",89,"tx_irretutorial_1ncsv_hotels",1,0,0,"tx_irretutorial_1ncsv_hotel",7,,,,,
-,"2db63f17016e4a1f79d92b666d11e05b","pages",91,"tx_irretutorial_1ncsv_hotels",1,0,0,"tx_irretutorial_1ncsv_hotel",8,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3,,
+,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4,,
+,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,,
+,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7,,
+,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,,
+,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12,,
+,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"bb5a44775aad69cd24228d6076375e42","pages",91,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",6,,
+,"e977e77558d5a04292e8e8a236f00bcc","pages",89,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",7,,
+,"2db63f17016e4a1f79d92b666d11e05b","pages",91,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",8,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageTwiceWExclude.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageTwiceWExclude.csv
index 92ec2f747ba5c8314ecd487458632c3e84f4fc3f..9328bf79e62d20bc6194fee89d91162fc8b13d2c 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageTwiceWExclude.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageTwiceWExclude.csv
@@ -1,31 +1,31 @@
-pages,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,tx_irretutorial_1ncsv_hotels,,
-,1,0,256,0,0,0,0,0,0,0,FunctionalTest,,,
-,88,1,256,0,0,0,0,0,0,0,DataHandlerTest,,,
-,89,88,256,0,0,0,0,0,0,0,Relations,2,,
-,90,88,512,0,0,0,0,0,0,0,Target,,,
+"pages",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","tx_irretutorial_1ncsv_hotels",,
+,1,0,256,0,0,0,0,0,0,0,"FunctionalTest",,,
+,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest",,,
+,89,88,256,0,0,0,0,0,0,0,"Relations",2,,
+,90,88,512,0,0,0,0,0,0,0,"Target",,,
,91,88,256,0,0,0,0,0,0,0,"[Translate to Dansk:] Relations",6,,
,92,88,256,0,0,0,0,0,0,0,"[Translate to Deutsch:] Relations",7,,
-tt_content,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,tx_irretutorial_1ncsv_hotels
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",5
-tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,offers
+"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,2,89,1,0,0,0,0,0,0,0,0,0,"Hotel #0",
,3,89,256,0,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,0,"Hotel #1",8
,6,89,32,0,1,2,2,0,0,0,0,0,"Hotel #0",
,7,89,16,0,2,2,2,0,0,0,0,0,"Hotel #0",
-tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
+"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
,6,89,128,0,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,0,"Offer #1.1",13
-tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,
+"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,8,89,128,0,0,0,0,0,0,0,0,0,"Price #1.1.2",
,9,89,64,0,0,0,0,0,0,0,0,0,"Price #1.1.3",
@@ -34,14 +34,29 @@ tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
,12,89,8,0,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"b32056cee8022b0baad3e58777756ccb","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"3f20e3df48945370654d7dfc508e1d36","tx_irretutorial_1ncsv_hotel",6,"l18n_parent",0,0,0,"tx_irretutorial_1ncsv_hotel",2,,,,,
-,"bb5a44775aad69cd24228d6076375e42","pages",91,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",6,,,,,
-,"595e5e033f510dde7c921d3381b382c4","pages",92,"l10n_parent",0,0,0,"pages",89,,,,,
-,"d9b676030a71bcc2e059eb713ec3aac0","pages",92,"sys_language_uid",0,0,0,"sys_language",2,,,,,
-,"01faf0f336b96ee1463a33eb9ee77828","tx_irretutorial_1ncsv_hotel",7,"sys_language_uid",0,0,0,"sys_language",2,,,,,
-,"3e33bbeb48c8e9c64e889ff056bf917b","tx_irretutorial_1ncsv_hotel",7,"l18n_parent",0,0,0,"tx_irretutorial_1ncsv_hotel",2,,,,,
-,"c8dd7216c586b7653713125f2b2f326e","pages",92,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",7,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3,,
+,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4,,
+,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,,
+,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7,,
+,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,,
+,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12,,
+,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,
+,"b32056cee8022b0baad3e58777756ccb","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"3f20e3df48945370654d7dfc508e1d36","tx_irretutorial_1ncsv_hotel",6,"l18n_parent",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"bb5a44775aad69cd24228d6076375e42","pages",91,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",6,,
+,"01faf0f336b96ee1463a33eb9ee77828","tx_irretutorial_1ncsv_hotel",7,"sys_language_uid",,,,0,0,0,"sys_language",2,,
+,"3e33bbeb48c8e9c64e889ff056bf917b","tx_irretutorial_1ncsv_hotel",7,"l18n_parent",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"595e5e033f510dde7c921d3381b382c4","pages",92,"l10n_parent",,,,0,0,0,"pages",89,,
+,"d9b676030a71bcc2e059eb713ec3aac0","pages",92,"sys_language_uid",,,,0,0,0,"sys_language",2,,
+,"c8dd7216c586b7653713125f2b2f326e","pages",92,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",7,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageWExclude.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageWExclude.csv
index ce106ff3fbfd0c410cdbddac0d31754a0f1b7d0c..9925f2ae6f5cee446a5e45edeaeb97a7d3b76a7a 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageWExclude.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageWExclude.csv
@@ -1,29 +1,29 @@
-pages,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,tx_irretutorial_1ncsv_hotels,,
-,1,0,256,0,0,0,0,0,0,0,FunctionalTest,,,
-,88,1,256,0,0,0,0,0,0,0,DataHandlerTest,,,
-,89,88,256,0,0,0,0,0,0,0,Relations,2,,
-,90,88,512,0,0,0,0,0,0,0,Target,,,
+"pages",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","tx_irretutorial_1ncsv_hotels",,
+,1,0,256,0,0,0,0,0,0,0,"FunctionalTest",,,
+,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest",,,
+,89,88,256,0,0,0,0,0,0,0,"Relations",2,,
+,90,88,512,0,0,0,0,0,0,0,"Target",,,
,91,88,256,0,0,0,0,0,0,0,"[Translate to Dansk:] Relations",6,,
-tt_content,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,tx_irretutorial_1ncsv_hotels
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",5
-tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,offers
+"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,2,89,1,0,0,0,0,0,0,0,0,0,"Hotel #0",
,3,89,256,0,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,0,"Hotel #1",8
,6,89,32,0,1,2,2,0,0,0,0,0,"Hotel #0",
-tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
+"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
,6,89,128,0,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,0,"Offer #1.1",13
-tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,
+"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,8,89,128,0,0,0,0,0,0,0,0,0,"Price #1.1.2",
,9,89,64,0,0,0,0,0,0,0,0,0,"Price #1.1.3",
@@ -32,9 +32,24 @@ tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
,12,89,8,0,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"b32056cee8022b0baad3e58777756ccb","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"3f20e3df48945370654d7dfc508e1d36","tx_irretutorial_1ncsv_hotel",6,"l18n_parent",0,0,0,"tx_irretutorial_1ncsv_hotel",2,,,,,
-,"bb5a44775aad69cd24228d6076375e42","pages",91,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",6,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3,,
+,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4,,
+,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,,
+,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7,,
+,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,,
+,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12,,
+,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,
+,"b32056cee8022b0baad3e58777756ccb","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"3f20e3df48945370654d7dfc508e1d36","tx_irretutorial_1ncsv_hotel",6,"l18n_parent",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"bb5a44775aad69cd24228d6076375e42","pages",91,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",6,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageWSynchronization.csv
index d709377e47ebb7a898c440328eeec65b750a7ab3..ed9ceacd32b69f46fce11589cd7186e3d18b08c2 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageWSynchronization.csv
@@ -1,29 +1,29 @@
-pages,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,tx_irretutorial_1ncsv_hotels,,
-,1,0,256,0,0,0,0,0,0,0,FunctionalTest,,,
-,88,1,256,0,0,0,0,0,0,0,DataHandlerTest,,,
-,89,88,256,0,0,0,0,0,0,0,Relations,2,,
-,90,88,512,0,0,0,0,0,0,0,Target,,,
+"pages",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","tx_irretutorial_1ncsv_hotels",,
+,1,0,256,0,0,0,0,0,0,0,"FunctionalTest",,,
+,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest",,,
+,89,88,256,0,0,0,0,0,0,0,"Relations",2,,
+,90,88,512,0,0,0,0,0,0,0,"Target",,,
,91,88,256,0,0,0,0,0,0,0,"[Translate to Dansk:] Relations",6,,
-tt_content,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,tx_irretutorial_1ncsv_hotels
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",5
-tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,offers
+"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,2,89,1,0,0,0,0,0,0,0,0,0,"Hotel #0",
,3,89,256,0,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,0,"Hotel #1",8
,6,89,32,0,1,2,2,0,0,0,0,0,"[Translate to Dansk:] Hotel #0",
-tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
+"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
,6,89,128,0,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,0,"Offer #1.1",13
-tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,
+"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,8,89,128,0,0,0,0,0,0,0,0,0,"Price #1.1.2",
,9,89,64,0,0,0,0,0,0,0,0,0,"Price #1.1.3",
@@ -32,9 +32,24 @@ tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
,12,89,8,0,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"b32056cee8022b0baad3e58777756ccb","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"3f20e3df48945370654d7dfc508e1d36","tx_irretutorial_1ncsv_hotel",6,"l18n_parent",0,0,0,"tx_irretutorial_1ncsv_hotel",2,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"bb5a44775aad69cd24228d6076375e42","pages",91,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",6,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3,,
+,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4,,
+,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,,
+,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7,,
+,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,,
+,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12,,
+,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,
+,"b32056cee8022b0baad3e58777756ccb","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"3f20e3df48945370654d7dfc508e1d36","tx_irretutorial_1ncsv_hotel",6,"l18n_parent",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"bb5a44775aad69cd24228d6076375e42","pages",91,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",6,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageWithSynchronizationAndCustomLocalizedHotel.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageWithSynchronizationAndCustomLocalizedHotel.csv
index 9534b26997e0ecf40a9981c1e9984e9558e8aa2f..747bf0209092baccf15784b133203c5f57ba263b 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageWithSynchronizationAndCustomLocalizedHotel.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageWithSynchronizationAndCustomLocalizedHotel.csv
@@ -1,30 +1,30 @@
-pages,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,tx_irretutorial_1ncsv_hotels,,
-,1,0,256,0,0,0,0,0,0,0,FunctionalTest,,,
-,88,1,256,0,0,0,0,0,0,0,DataHandlerTest,,,
-,89,88,256,0,0,0,0,0,0,0,Relations,2,,
-,90,88,512,0,0,0,0,0,0,0,Target,,,
+"pages",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","tx_irretutorial_1ncsv_hotels",,
+,1,0,256,0,0,0,0,0,0,0,"FunctionalTest",,,
+,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest",,,
+,89,88,256,0,0,0,0,0,0,0,"Relations",2,,
+,90,88,512,0,0,0,0,0,0,0,"Target",,,
,91,88,256,0,0,0,0,0,0,0,"[Translate to Dansk:] Relations","6,7",,
-tt_content,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,tx_irretutorial_1ncsv_hotels
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",5
-tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,offers
+"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,2,89,1,0,0,0,0,0,0,0,0,0,"Hotel #0",
,3,89,256,0,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,0,"Hotel #1",8
,6,89,32,0,1,2,2,0,0,0,0,0,"[Translate to Dansk:] Hotel #0",
,7,89,0,0,1,0,0,0,0,0,0,0,"Hotel in dansk page only",
-tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
+"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
,6,89,128,0,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,0,"Offer #1.1",13
-tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,
+"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,8,89,128,0,0,0,0,0,0,0,0,0,"Price #1.1.2",
,9,89,64,0,0,0,0,0,0,0,0,0,"Price #1.1.3",
@@ -33,11 +33,26 @@ tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
,12,89,8,0,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"b32056cee8022b0baad3e58777756ccb","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"3f20e3df48945370654d7dfc508e1d36","tx_irretutorial_1ncsv_hotel",6,"l18n_parent",0,0,0,"tx_irretutorial_1ncsv_hotel",2,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"bb5a44775aad69cd24228d6076375e42","pages",91,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",6,,,,,
-,"3d99dc85913d2f773fde97f51868e42e","tx_irretutorial_1ncsv_hotel",7,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"3567dc2b7ae08e0fedbf90a9e2060acd","pages",91,"tx_irretutorial_1ncsv_hotels",1,0,0,"tx_irretutorial_1ncsv_hotel",7,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3,,
+,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4,,
+,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,,
+,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7,,
+,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,,
+,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12,,
+,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,
+,"b32056cee8022b0baad3e58777756ccb","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"3f20e3df48945370654d7dfc508e1d36","tx_irretutorial_1ncsv_hotel",6,"l18n_parent",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"bb5a44775aad69cd24228d6076375e42","pages",91,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",6,,
+,"3567dc2b7ae08e0fedbf90a9e2060acd","pages",91,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",7,,
+,"3d99dc85913d2f773fde97f51868e42e","tx_irretutorial_1ncsv_hotel",7,"sys_language_uid",,,,0,0,0,"sys_language",1,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeParentContentLanguageSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeParentContentLanguageSynchronization.csv
index 61ced12775dd9120b10b19c7c7b5162a8f3746b2..d3cb51fbe4f77809ea15ff24b3d7ab5ddd77902a 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeParentContentLanguageSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeParentContentLanguageSynchronization.csv
@@ -1,10 +1,10 @@
-tt_content,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,tx_irretutorial_1ncsv_hotels
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2","5,7"
,299,89,768,0,1,298,298,0,0,0,0,0,"[Translate to Dansk:] Regular Element #2","6,8"
-tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,offers
+"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,2,89,513,0,0,0,0,0,0,0,0,0,"Hotel #0",
,3,89,768,0,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,640,0,0,0,0,0,0,0,0,0,"Hotel #2",7
@@ -12,15 +12,15 @@ tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
,6,89,608,0,1,5,5,0,0,0,0,0,"[Translate to Dansk:] Hotel #1",9
,7,89,512,0,0,0,0,0,0,0,0,0,"Hotel #2",
,8,89,256,0,1,7,0,0,0,0,0,0,"[Translate to Dansk:] Hotel #2",
-tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
+"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
,6,89,128,0,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,0,"Offer #1.1",13
,9,89,48,0,1,8,8,0,0,0,0,0,"[Translate to Dansk:] Offer #1.1",14
-tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,
+"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,8,89,128,0,0,0,0,0,0,0,0,0,"Price #1.1.2",
,9,89,64,0,0,0,0,0,0,0,0,0,"Price #1.1.3",
@@ -30,21 +30,35 @@ tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
,13,89,4,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,14,89,6,0,1,13,13,0,0,0,0,0,"[Translate to Dansk:] Price #1.1.1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"ccb9f42691f43cb052dbe5d461d1b6a3","tx_irretutorial_1ncsv_price",14,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"5c7dd03e5be54ce97a36d47d9d3a6e0e","tx_irretutorial_1ncsv_price",14,"l18n_parent",0,0,0,"tx_irretutorial_1ncsv_price",13,,,,,
-,"3f199727e51d98f7e00738c7e8c68560","tx_irretutorial_1ncsv_offer",9,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"eb6f94b5507dc1ad07d0d456468689c7","tx_irretutorial_1ncsv_offer",9,"l18n_parent",0,0,0,"tx_irretutorial_1ncsv_offer",8,,,,,
-,"82d25027c994d718124afddeffd4007e","tx_irretutorial_1ncsv_offer",9,"prices",0,0,0,"tx_irretutorial_1ncsv_price",14,,,,,
-,"b32056cee8022b0baad3e58777756ccb","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"c65d8da4324b6210fac699ee72f37a6d","tx_irretutorial_1ncsv_hotel",6,"l18n_parent",0,0,0,"tx_irretutorial_1ncsv_hotel",5,,,,,
-,"1a8122d5b6f753957e91247a2df13b05","tx_irretutorial_1ncsv_hotel",6,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",9,,,,,
-,"aa9d44bd50d47873e29c5a4987bda6e0","tt_content",299,"l18n_parent",0,0,0,"tt_content",298,,,,,
-,"5822ca52c92c38f97af7a3cf2e50afc7","tt_content",299,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",6,,,,,
-,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",5,,,,,
-,"d21577d8823354284457e79284817fd5","tx_irretutorial_1ncsv_hotel",8,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"9fc9de1c8d4ce857c7999dfd3a7e8500","tt_content",298,"tx_irretutorial_1ncsv_hotels",1,0,0,"tx_irretutorial_1ncsv_hotel",7,,,,,
-,"db5b1a958e44c27efb6c3b03ae586241","tt_content",299,"tx_irretutorial_1ncsv_hotels",1,0,0,"tx_irretutorial_1ncsv_hotel",8,,,,,
-,"207fcbad164fca2c961bd271a5bf98d8","tx_irretutorial_1ncsv_hotel",8,"l18n_parent",0,0,0,"tx_irretutorial_1ncsv_hotel",7,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3,,
+,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4,,
+,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,,
+,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7,,
+,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,,
+,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12,,
+,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"ccb9f42691f43cb052dbe5d461d1b6a3","tx_irretutorial_1ncsv_price",14,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"5c7dd03e5be54ce97a36d47d9d3a6e0e","tx_irretutorial_1ncsv_price",14,"l18n_parent",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,
+,"3f199727e51d98f7e00738c7e8c68560","tx_irretutorial_1ncsv_offer",9,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"eb6f94b5507dc1ad07d0d456468689c7","tx_irretutorial_1ncsv_offer",9,"l18n_parent",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,
+,"82d25027c994d718124afddeffd4007e","tx_irretutorial_1ncsv_offer",9,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",14,,
+,"b32056cee8022b0baad3e58777756ccb","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"c65d8da4324b6210fac699ee72f37a6d","tx_irretutorial_1ncsv_hotel",6,"l18n_parent",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"1a8122d5b6f753957e91247a2df13b05","tx_irretutorial_1ncsv_hotel",6,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",9,,
+,"aa9d44bd50d47873e29c5a4987bda6e0","tt_content",299,"l18n_parent",,,,0,0,0,"tt_content",298,,
+,"5822ca52c92c38f97af7a3cf2e50afc7","tt_content",299,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",6,,
+,"9fc9de1c8d4ce857c7999dfd3a7e8500","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",7,,
+,"db5b1a958e44c27efb6c3b03ae586241","tt_content",299,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",8,,
+,"d21577d8823354284457e79284817fd5","tx_irretutorial_1ncsv_hotel",8,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"207fcbad164fca2c961bd271a5bf98d8","tx_irretutorial_1ncsv_hotel",8,"l18n_parent",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",7,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeParentContentSelect.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeParentContentSelect.csv
index 1ca2d5c9e1d7de5caff27cf75b78c0819bfcc11c..61432fe3c2b5320c775e2575c40334ae494860b6 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeParentContentSelect.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeParentContentSelect.csv
@@ -24,4 +24,4 @@
,12,89,8,0,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeParentContentWAllChildren.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeParentContentWAllChildren.csv
index 8e75f8dd91a300a1f60dd43823821305fe24f1aa..24b16a915e2f8d88d038d6c2921a5a633daa0b9c 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeParentContentWAllChildren.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeParentContentWAllChildren.csv
@@ -1,24 +1,24 @@
-tt_content,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,tx_irretutorial_1ncsv_hotels
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",5
,299,89,768,0,1,298,298,0,0,0,0,0,"[Translate to Dansk:] Regular Element #2",6
-tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,offers
+"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,2,89,1,0,0,0,0,0,0,0,0,0,"Hotel #0",
,3,89,256,0,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,0,"Hotel #1",8
,6,89,96,0,1,5,5,0,0,0,0,0,"[Translate to Dansk:] Hotel #1",9
-tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
+"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
,6,89,128,0,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,0,"Offer #1.1",13
,9,89,48,0,1,8,8,0,0,0,0,0,"[Translate to Dansk:] Offer #1.1",14
-tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,
+"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,8,89,128,0,0,0,0,0,0,0,0,0,"Price #1.1.2",
,9,89,64,0,0,0,0,0,0,0,0,0,"Price #1.1.3",
@@ -28,16 +28,31 @@ tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
,13,89,4,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,14,89,6,0,1,13,13,0,0,0,0,0,"[Translate to Dansk:] Price #1.1.1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"ccb9f42691f43cb052dbe5d461d1b6a3","tx_irretutorial_1ncsv_price",14,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"5c7dd03e5be54ce97a36d47d9d3a6e0e","tx_irretutorial_1ncsv_price",14,"l18n_parent",0,0,0,"tx_irretutorial_1ncsv_price",13,,,,,
-,"3f199727e51d98f7e00738c7e8c68560","tx_irretutorial_1ncsv_offer",9,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"eb6f94b5507dc1ad07d0d456468689c7","tx_irretutorial_1ncsv_offer",9,"l18n_parent",0,0,0,"tx_irretutorial_1ncsv_offer",8,,,,,
-,"82d25027c994d718124afddeffd4007e","tx_irretutorial_1ncsv_offer",9,"prices",0,0,0,"tx_irretutorial_1ncsv_price",14,,,,,
-,"b32056cee8022b0baad3e58777756ccb","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"c65d8da4324b6210fac699ee72f37a6d","tx_irretutorial_1ncsv_hotel",6,"l18n_parent",0,0,0,"tx_irretutorial_1ncsv_hotel",5,,,,,
-,"1a8122d5b6f753957e91247a2df13b05","tx_irretutorial_1ncsv_hotel",6,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",9,,,,,
-,"aa9d44bd50d47873e29c5a4987bda6e0","tt_content",299,"l18n_parent",0,0,0,"tt_content",298,,,,,
-,"5822ca52c92c38f97af7a3cf2e50afc7","tt_content",299,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",6,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3,,
+,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4,,
+,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,,
+,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7,,
+,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,,
+,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12,,
+,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"ccb9f42691f43cb052dbe5d461d1b6a3","tx_irretutorial_1ncsv_price",14,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"5c7dd03e5be54ce97a36d47d9d3a6e0e","tx_irretutorial_1ncsv_price",14,"l18n_parent",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,
+,"3f199727e51d98f7e00738c7e8c68560","tx_irretutorial_1ncsv_offer",9,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"eb6f94b5507dc1ad07d0d456468689c7","tx_irretutorial_1ncsv_offer",9,"l18n_parent",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,
+,"82d25027c994d718124afddeffd4007e","tx_irretutorial_1ncsv_offer",9,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",14,,
+,"b32056cee8022b0baad3e58777756ccb","tx_irretutorial_1ncsv_hotel",6,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"c65d8da4324b6210fac699ee72f37a6d","tx_irretutorial_1ncsv_hotel",6,"l18n_parent",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"1a8122d5b6f753957e91247a2df13b05","tx_irretutorial_1ncsv_hotel",6,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",9,,
+,"aa9d44bd50d47873e29c5a4987bda6e0","tt_content",299,"l18n_parent",,,,0,0,0,"tt_content",298,,
+,"5822ca52c92c38f97af7a3cf2e50afc7","tt_content",299,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",6,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyOnlyHotelChild.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyOnlyHotelChild.csv
index 958a142e226776af1ff4030424e1042927750ac6..b2526c8a4b7e3ebaa44add76b1a8288bc7a8da29 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyOnlyHotelChild.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyOnlyHotelChild.csv
@@ -1,21 +1,21 @@
-tt_content,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,tx_irretutorial_1ncsv_hotels
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",5
-tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,offers
+"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,2,89,1,0,0,0,0,0,0,0,0,0,"Hotel #0",
,3,89,256,0,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,0,"Testing #1",7
,5,89,64,0,0,0,0,0,0,0,0,0,"Hotel #1",8
-tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
+"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
,6,89,128,0,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,0,"Offer #1.1",13
-tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,
+"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,8,89,128,0,0,0,0,0,0,0,0,0,"Price #1.1.2",
,9,89,64,0,0,0,0,0,0,0,0,0,"Price #1.1.3",
@@ -24,5 +24,19 @@ tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
,12,89,8,0,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",7,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3,,
+,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4,,
+,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,,
+,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7,,
+,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,,
+,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12,,
+,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyPage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyPage.csv
index b44417dba46ffde7ea06ed3dc47709ff70314ff4..6adfdb20cebb003c22f7510f3bba1af8c325b215 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyPage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyPage.csv
@@ -1,9 +1,23 @@
-pages,,,,,,,,,,,,
-,uid,pid,sorting,deleted,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,tx_irretutorial_1ncsv_hotels
-,1,0,256,0,0,0,0,0,0,0,FunctionalTest,
-,88,1,256,0,0,0,0,0,0,0,DataHandlerTest,
-,89,88,256,0,0,0,0,0,0,0,"Testing #1",2
-,90,88,512,0,0,0,0,0,0,0,Target,
-"sys_refindex",,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,
-,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",2,,,
+"pages",,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","tx_irretutorial_1ncsv_hotels",
+,1,0,256,0,0,0,0,0,0,0,"FunctionalTest",,
+,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest",,
+,89,88,256,0,0,0,0,0,0,0,"Testing #1",2,
+,90,88,512,0,0,0,0,0,0,0,"Target",,
+"sys_refindex",,,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string"
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,
+,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3,
+,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4,
+,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,
+,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7,
+,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,
+,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12,
+,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentContent.csv
index 99f681466efc7119b779d6f55ff8afd5dbbef6d6..dad5c31e0cc4dfef2793718b7f0f4558bfdab5e9 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentContent.csv
@@ -1,7 +1,21 @@
-tt_content,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,tx_irretutorial_1ncsv_hotels
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,0,"Testing #1",5
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",5,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3,,
+,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4,,
+,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,,
+,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7,,
+,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,,
+,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12,,
+,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNAddHotelChild.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNAddHotelChild.csv
index f22482b64e7677d3159c97a66761900d5bad1a65..1a48073a18a9483192be1ec12fb418fab3bb981d 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNAddHotelChild.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNAddHotelChild.csv
@@ -1,22 +1,22 @@
-tt_content,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,tx_irretutorial_1ncsv_hotels
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2","5,6"
-tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,offers
+"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,2,89,1,0,0,0,0,0,0,0,0,0,"Hotel #0",
,3,89,256,0,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,0,"Hotel #1",8
,6,89,0,0,0,0,0,0,0,0,0,0,"Hotel #2",
-tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
+"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
,6,89,128,0,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,0,"Offer #1.1",13
-tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,
+"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,8,89,128,0,0,0,0,0,0,0,0,0,"Price #1.1.2",
,9,89,64,0,0,0,0,0,0,0,0,0,"Price #1.1.3",
@@ -25,6 +25,20 @@ tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
,12,89,8,0,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",5,,,,,
-,"aef6d4edebec8414d0ed7942f4267fe1","tt_content",298,"tx_irretutorial_1ncsv_hotels",1,0,0,"tx_irretutorial_1ncsv_hotel",6,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3,,
+,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4,,
+,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,,
+,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7,,
+,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,,
+,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12,,
+,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,
+,"aef6d4edebec8414d0ed7942f4267fe1","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",6,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNChangeHotelChildrenSorting.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNChangeHotelChildrenSorting.csv
index 675ca0b58870c34f4062c47d975adc6af981045d..a7b91cd5bf980e388ddd8faaf65b90f01d5f603d 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNChangeHotelChildrenSorting.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNChangeHotelChildrenSorting.csv
@@ -1,21 +1,21 @@
-tt_content,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,tx_irretutorial_1ncsv_hotels
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1","4,3"
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",5
-tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,offers
+"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,2,89,1,0,0,0,0,0,0,0,0,0,"Hotel #0",
,3,89,256,0,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,0,"Hotel #1",8
-tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
+"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
,6,89,128,0,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,0,"Offer #1.1",13
-tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,
+"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,8,89,128,0,0,0,0,0,0,0,0,0,"Price #1.1.2",
,9,89,64,0,0,0,0,0,0,0,0,0,"Price #1.1.3",
@@ -24,6 +24,19 @@ tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
,12,89,8,0,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"243b23395be81483a997191dea50d675","tt_content",297,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",4,,,,,
-,"2b5a5223615b906bdb96157ccb94d2c2","tt_content",297,"tx_irretutorial_1ncsv_hotels",1,0,0,"tx_irretutorial_1ncsv_hotel",3,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,,
+,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7,,
+,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,,
+,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12,,
+,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,
+,"243b23395be81483a997191dea50d675","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",4,,
+,"2b5a5223615b906bdb96157ccb94d2c2","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",3,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNDeleteHotelChild.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNDeleteHotelChild.csv
index 027f56a62ac477fbef57b42360f3a107573f7f08..b149c251ecd9e01b0a0b4da485348d500f9c6fb4 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNDeleteHotelChild.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNDeleteHotelChild.csv
@@ -1,21 +1,21 @@
-tt_content,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,tx_irretutorial_1ncsv_hotels
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",3
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",5
-tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,offers
+"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,2,89,1,0,0,0,0,0,0,0,0,0,"Hotel #0",
,3,89,256,0,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,1,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,89,64,0,0,0,0,0,0,0,0,0,"Hotel #1",8
-tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
+"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
,6,89,128,0,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,1,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,0,"Offer #1.1",13
-tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,
+"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,8,89,128,0,0,0,0,0,0,0,0,0,"Price #1.1.2",
,9,89,64,0,0,0,0,0,0,0,0,0,"Price #1.1.3",
@@ -24,7 +24,18 @@ tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
,12,89,8,1,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",3,,,,,
-,"99c522a367159f97706e6e255b2cd701","tx_irretutorial_1ncsv_offer",7,"prices",0,1,0,"tx_irretutorial_1ncsv_price",12,,,,,
-,"b5aec3780d4d441b3c3a9511421016e8","tx_irretutorial_1ncsv_hotel",4,"offers",0,1,0,"tx_irretutorial_1ncsv_offer",7,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3,,
+,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,,
+,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,,
+,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,
+,"99c522a367159f97706e6e255b2cd701","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,1,0,"tx_irretutorial_1ncsv_price",12,,
+,"b5aec3780d4d441b3c3a9511421016e8","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,1,0,"tx_irretutorial_1ncsv_offer",7,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNHotelChild.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNHotelChild.csv
index 2f12bf6fe08242a285cc20cb4d4fd771d879789b..b2526c8a4b7e3ebaa44add76b1a8288bc7a8da29 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNHotelChild.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/modifyParentNHotelChild.csv
@@ -1,21 +1,21 @@
-tt_content,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,tx_irretutorial_1ncsv_hotels
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",5
-tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,offers
+"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,2,89,1,0,0,0,0,0,0,0,0,0,"Hotel #0",
,3,89,256,0,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,0,"Testing #1",7
,5,89,64,0,0,0,0,0,0,0,0,0,"Hotel #1",8
-tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
+"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
,6,89,128,0,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,89,32,0,0,0,0,0,0,0,0,0,"Offer #1.1",13
-tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,
+"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,8,89,128,0,0,0,0,0,0,0,0,0,"Price #1.1.2",
,9,89,64,0,0,0,0,0,0,0,0,0,"Price #1.1.3",
@@ -24,7 +24,19 @@ tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
,12,89,8,0,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,89,4,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",0,0,0,"tx_irretutorial_1ncsv_hotel",3,,,,,
-,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",1,0,0,"tx_irretutorial_1ncsv_hotel",4,,,,,
-,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",0,0,0,"tx_irretutorial_1ncsv_offer",7,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3,,
+,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4,,
+,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,,
+,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7,,
+,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,,
+,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12,,
+,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/moveParentContentToDifferentPage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/moveParentContentToDifferentPage.csv
index 7736d3ed21e5c7bf87c5c5e4f594741df0176b1c..ffb2d474c8a3a9e08b02e05071b75dd8e761d406 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/moveParentContentToDifferentPage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/moveParentContentToDifferentPage.csv
@@ -1,21 +1,21 @@
-tt_content,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,tx_irretutorial_1ncsv_hotels
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,90,256,0,0,0,0,0,0,0,0,0,"Regular Element #2",5
-tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,offers
+"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,2,89,1,0,0,0,0,0,0,0,0,0,"Hotel #0",
,3,89,256,0,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,89,128,0,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,90,256,0,0,0,0,0,0,0,0,0,"Hotel #1",8
-tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
+"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,89,256,0,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
,6,89,128,0,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,89,64,0,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,90,256,0,0,0,0,0,0,0,0,0,"Offer #1.1",13
-tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,
+"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,89,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,8,89,128,0,0,0,0,0,0,0,0,0,"Price #1.1.2",
,9,89,64,0,0,0,0,0,0,0,0,0,"Price #1.1.3",
@@ -24,4 +24,19 @@ tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
,12,89,8,0,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,90,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3,,
+,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4,,
+,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,,
+,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7,,
+,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,,
+,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12,,
+,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/moveParentContentToDifferentPageNChangeSorting.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
index 82ca8aa95aab70960d9274212bcc11ca2c97b5fe..06cb5e69d0202fffa27bf7a9fe0d3b8f296b70ba 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
@@ -1,21 +1,21 @@
-tt_content,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,tx_irretutorial_1ncsv_hotels
+"tt_content",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1ncsv_hotels"
,297,90,512,0,0,0,0,0,0,0,0,0,"Regular Element #1","3,4"
,298,90,256,0,0,0,0,0,0,0,0,0,"Regular Element #2",5
-tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,offers
+"tx_irretutorial_1ncsv_hotel",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","offers"
,2,89,1,0,0,0,0,0,0,0,0,0,"Hotel #0",
,3,90,64,0,0,0,0,0,0,0,0,0,"Hotel #1","5,6"
,4,90,128,0,0,0,0,0,0,0,0,0,"Hotel #2",7
,5,90,256,0,0,0,0,0,0,0,0,0,"Hotel #1",8
-tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
+"tx_irretutorial_1ncsv_offer",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","prices"
,5,90,32,0,0,0,0,0,0,0,0,0,"Offer #1.1","7,8,9"
,6,90,64,0,0,0,0,0,0,0,0,0,"Offer #1.2","10,11"
,7,90,128,0,0,0,0,0,0,0,0,0,"Offer #2.1",12
,8,90,256,0,0,0,0,0,0,0,0,0,"Offer #1.1",13
-tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,
+"tx_irretutorial_1ncsv_price",,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
,7,90,4,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
,8,90,8,0,0,0,0,0,0,0,0,0,"Price #1.1.2",
,9,90,16,0,0,0,0,0,0,0,0,0,"Price #1.1.3",
@@ -24,4 +24,19 @@ tx_irretutorial_1ncsv_price,,,,,,,,,,,,,,
,12,90,128,0,0,0,0,0,0,0,0,0,"Price #2.1.1",
,13,90,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"4787480de4393ca84a67fff60accb7b7","pages",89,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",2,,
+,"d9f44c388aa588099712d6670cbc6434","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",3,,
+,"28d0d42330e7526ee15e2b2d2a12ff25","tt_content",297,"tx_irretutorial_1ncsv_hotels",,,,1,0,0,"tx_irretutorial_1ncsv_hotel",4,,
+,"11b80c408e5be8cc1b25d43b088ff654","tt_content",298,"tx_irretutorial_1ncsv_hotels",,,,0,0,0,"tx_irretutorial_1ncsv_hotel",5,,
+,"58cef9b05aef0a9f8347c142bb5573e7","tx_irretutorial_1ncsv_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",5,,
+,"b67fb0deabbe6e5c9e75b9e151e5897a","tx_irretutorial_1ncsv_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1ncsv_offer",6,,
+,"90505db860f187c6eae5d900b1447a06","tx_irretutorial_1ncsv_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",7,,
+,"478c7ed15330bd7cf68ca27cfbd1cee6","tx_irretutorial_1ncsv_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1ncsv_offer",8,,
+,"b88ffb156f67d9259af407eec374f3a1","tx_irretutorial_1ncsv_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",7,,
+,"f304da1bc292b25ce439369871ed39a4","tx_irretutorial_1ncsv_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",8,,
+,"ba481fa37867b2427dc4c6ea535391c1","tx_irretutorial_1ncsv_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1ncsv_price",9,,
+,"49285566be2befb8cbbd07d37cfd2bc5","tx_irretutorial_1ncsv_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",10,,
+,"3178d1ee76c81fd8e1df63f1ea01fed0","tx_irretutorial_1ncsv_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1ncsv_price",11,,
+,"ab1e9a9e0886a217f4f4b5c1f3fde0b8","tx_irretutorial_1ncsv_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",12,,
+,"0743c3e1d65b2bc5d64ef528767c3a32","tx_irretutorial_1ncsv_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1ncsv_price",13,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/DataSet/LiveDefaultElements.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/DataSet/LiveDefaultElements.csv
index 7ee4ed28963d14984890155812d32c4b3c3223c6..383981b5be3f2561e189d8b8466d7ec6c15dad6b 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/DataSet/LiveDefaultElements.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/DataSet/LiveDefaultElements.csv
@@ -27,3 +27,20 @@
,11,89,2,0,0,0,,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
,12,89,1,0,0,0,,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
,13,89,1,0,0,0,,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+"sys_refindex",,,,,,,,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,,,,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/ActionTest.php b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/ActionTest.php
index c1b3df9051643cd297d5c07d3c119c083c87d31f..7e1ecfb9dcdcaa90671649ab89024e3800227c34 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/ActionTest.php
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/ActionTest.php
@@ -29,8 +29,13 @@ class ActionTest extends AbstractActionTestCase
protected $assertionDataSetDirectory = 'typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/';
/**
- * Parent content records
+ * @test
*/
+ public function verifyCleanReferenceIndex()
+ {
+ // The test verifies the imported data set has a clean reference index by the check in tearDown()
+ self::assertTrue(true);
+ }
/**
* @test
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 315b99935c681dfa4c081bff66af64fa4e0c96fa..8b43f717067bc60691e61d9bec90d2f839b2d096 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
@@ -24,4 +24,19 @@
,12,89,1,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
"sys_refindex",,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,,,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,,,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,
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 570781e25943dbc7b913dca0802fa1eecc801241..c8e99d9d91022f92dc2664e9834da34b83df1a56 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
@@ -48,19 +48,34 @@
,19,91,2,0,0,0,11,0,0,0,0,0,"Price #1.2.2",11,"tx_irretutorial_1nff_offer",,
,20,91,1,0,0,0,12,0,0,0,0,0,"Price #2.1.1",12,"tx_irretutorial_1nff_offer",,
"sys_refindex",,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,
-,"821e210a4b42d0bd2605f5ab998cbe65","pages",91,"tx_irretutorial_hotels",0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,
-,"85bdb87074958e22a70cfdd900c1f5ac","tt_content",299,"tx_irretutorial_1nff_hotels",0,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,,,
-,"8592abf0fdcf42bde87f310dc93e40b8","tt_content",300,"tx_irretutorial_1nff_hotels",0,0,0,"tx_irretutorial_1nff_hotel",8,,,,,,,,
-,"2f62c8addeb0ebbc3c696059bc7be998","tt_content",300,"tx_irretutorial_1nff_hotels",1,0,0,"tx_irretutorial_1nff_hotel",9,,,,,,,,
-,"79cc995658ae92af7fa70085b8758270","tx_irretutorial_1nff_offer",9,"prices",0,0,0,"tx_irretutorial_1nff_price",14,,,,,,,,
-,"73593db0a5f6a18838c60179bb55cdec","tx_irretutorial_1nff_hotel",7,"offers",0,0,0,"tx_irretutorial_1nff_offer",9,,,,,,,,
-,"832e8f4e4020734e194fc9f4a3e1ba6a","tx_irretutorial_1nff_offer",10,"prices",0,0,0,"tx_irretutorial_1nff_price",15,,,,,,,,
-,"2b725e5999eee3bf86abca511c98d452","tx_irretutorial_1nff_offer",10,"prices",1,0,0,"tx_irretutorial_1nff_price",16,,,,,,,,
-,"f1b087504f89d0cc06bfa5999d30fb96","tx_irretutorial_1nff_offer",10,"prices",2,0,0,"tx_irretutorial_1nff_price",17,,,,,,,,
-,"27282ca3b14b1aa771ff89a520b2ad2e","tx_irretutorial_1nff_offer",11,"prices",0,0,0,"tx_irretutorial_1nff_price",18,,,,,,,,
-,"4e77986a21f02bed02af7a43326b08c1","tx_irretutorial_1nff_offer",11,"prices",1,0,0,"tx_irretutorial_1nff_price",19,,,,,,,,
-,"c08816de23d652bad8db6d862c10cde0","tx_irretutorial_1nff_hotel",8,"offers",0,0,0,"tx_irretutorial_1nff_offer",10,,,,,,,,
-,"73de10cee9b1ef3f0dd5293cd8e45bdd","tx_irretutorial_1nff_hotel",8,"offers",1,0,0,"tx_irretutorial_1nff_offer",11,,,,,,,,
-,"738d681b5ae88b8addad9baf0b0ac4b7","tx_irretutorial_1nff_offer",12,"prices",0,0,0,"tx_irretutorial_1nff_price",20,,,,,,,,
-,"17599cf538b8db53c94c798a38da0999","tx_irretutorial_1nff_hotel",9,"offers",0,0,0,"tx_irretutorial_1nff_offer",12,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,,,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,,,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,
+,"73593db0a5f6a18838c60179bb55cdec","tx_irretutorial_1nff_hotel",7,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",9,,,,,
+,"c08816de23d652bad8db6d862c10cde0","tx_irretutorial_1nff_hotel",8,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",10,,,,,
+,"73de10cee9b1ef3f0dd5293cd8e45bdd","tx_irretutorial_1nff_hotel",8,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",11,,,,,
+,"17599cf538b8db53c94c798a38da0999","tx_irretutorial_1nff_hotel",9,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",12,,,,,
+,"821e210a4b42d0bd2605f5ab998cbe65","pages",91,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
+,"79cc995658ae92af7fa70085b8758270","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",14,,,,,
+,"832e8f4e4020734e194fc9f4a3e1ba6a","tx_irretutorial_1nff_offer",10,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",15,,,,,
+,"2b725e5999eee3bf86abca511c98d452","tx_irretutorial_1nff_offer",10,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",16,,,,,
+,"f1b087504f89d0cc06bfa5999d30fb96","tx_irretutorial_1nff_offer",10,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",17,,,,,
+,"27282ca3b14b1aa771ff89a520b2ad2e","tx_irretutorial_1nff_offer",11,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",18,,,,,
+,"4e77986a21f02bed02af7a43326b08c1","tx_irretutorial_1nff_offer",11,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",19,,,,,
+,"738d681b5ae88b8addad9baf0b0ac4b7","tx_irretutorial_1nff_offer",12,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",20,,,,,
+,"85bdb87074958e22a70cfdd900c1f5ac","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",7,,,,,
+,"8592abf0fdcf42bde87f310dc93e40b8","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",8,,,,,
+,"2f62c8addeb0ebbc3c696059bc7be998","tt_content",300,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",9,,,,,
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 913638b163e2663ccbe93a73338ecd1e89bfb662..7eeae3a56c8b24d74cae882eae5bed6a71045b9a 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
@@ -48,19 +48,34 @@
,19,91,2,0,0,0,11,0,0,0,0,0,"Price #1.2.2",11,"tx_irretutorial_1nff_offer",,
,20,91,1,0,0,0,13,0,0,0,0,0,"Price #1.1.1",12,"tx_irretutorial_1nff_offer",,
"sys_refindex",,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,
-,"821e210a4b42d0bd2605f5ab998cbe65","pages",91,"tx_irretutorial_hotels",0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,
-,"73593db0a5f6a18838c60179bb55cdec","tx_irretutorial_1nff_hotel",7,"offers",0,0,0,"tx_irretutorial_1nff_offer",9,,,,,,,,
-,"c08816de23d652bad8db6d862c10cde0","tx_irretutorial_1nff_hotel",8,"offers",0,0,0,"tx_irretutorial_1nff_offer",10,,,,,,,,
-,"73de10cee9b1ef3f0dd5293cd8e45bdd","tx_irretutorial_1nff_hotel",8,"offers",1,0,0,"tx_irretutorial_1nff_offer",11,,,,,,,,
-,"17599cf538b8db53c94c798a38da0999","tx_irretutorial_1nff_hotel",9,"offers",0,0,0,"tx_irretutorial_1nff_offer",12,,,,,,,,
-,"1b437d1f476b7f4fde379d647b406cf5","tt_content",299,"tx_irretutorial_1nff_hotels",0,0,0,"tx_irretutorial_1nff_hotel",9,,,,,,,,
-,"8592abf0fdcf42bde87f310dc93e40b8","tt_content",300,"tx_irretutorial_1nff_hotels",0,0,0,"tx_irretutorial_1nff_hotel",8,,,,,,,,
-,"b82ccac524fdaddca4a50db7149556f0","tt_content",300,"tx_irretutorial_1nff_hotels",1,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,,,
-,"79cc995658ae92af7fa70085b8758270","tx_irretutorial_1nff_offer",9,"prices",0,0,0,"tx_irretutorial_1nff_price",14,,,,,,,,
-,"832e8f4e4020734e194fc9f4a3e1ba6a","tx_irretutorial_1nff_offer",10,"prices",0,0,0,"tx_irretutorial_1nff_price",15,,,,,,,,
-,"2b725e5999eee3bf86abca511c98d452","tx_irretutorial_1nff_offer",10,"prices",1,0,0,"tx_irretutorial_1nff_price",16,,,,,,,,
-,"f1b087504f89d0cc06bfa5999d30fb96","tx_irretutorial_1nff_offer",10,"prices",2,0,0,"tx_irretutorial_1nff_price",17,,,,,,,,
-,"27282ca3b14b1aa771ff89a520b2ad2e","tx_irretutorial_1nff_offer",11,"prices",0,0,0,"tx_irretutorial_1nff_price",18,,,,,,,,
-,"4e77986a21f02bed02af7a43326b08c1","tx_irretutorial_1nff_offer",11,"prices",1,0,0,"tx_irretutorial_1nff_price",19,,,,,,,,
-,"738d681b5ae88b8addad9baf0b0ac4b7","tx_irretutorial_1nff_offer",12,"prices",0,0,0,"tx_irretutorial_1nff_price",20,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,,,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,,,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,
+,"73593db0a5f6a18838c60179bb55cdec","tx_irretutorial_1nff_hotel",7,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",9,,,,,
+,"c08816de23d652bad8db6d862c10cde0","tx_irretutorial_1nff_hotel",8,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",10,,,,,
+,"73de10cee9b1ef3f0dd5293cd8e45bdd","tx_irretutorial_1nff_hotel",8,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",11,,,,,
+,"17599cf538b8db53c94c798a38da0999","tx_irretutorial_1nff_hotel",9,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",12,,,,,
+,"821e210a4b42d0bd2605f5ab998cbe65","pages",91,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
+,"79cc995658ae92af7fa70085b8758270","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",14,,,,,
+,"832e8f4e4020734e194fc9f4a3e1ba6a","tx_irretutorial_1nff_offer",10,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",15,,,,,
+,"2b725e5999eee3bf86abca511c98d452","tx_irretutorial_1nff_offer",10,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",16,,,,,
+,"f1b087504f89d0cc06bfa5999d30fb96","tx_irretutorial_1nff_offer",10,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",17,,,,,
+,"27282ca3b14b1aa771ff89a520b2ad2e","tx_irretutorial_1nff_offer",11,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",18,,,,,
+,"4e77986a21f02bed02af7a43326b08c1","tx_irretutorial_1nff_offer",11,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",19,,,,,
+,"738d681b5ae88b8addad9baf0b0ac4b7","tx_irretutorial_1nff_offer",12,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",20,,,,,
+,"1b437d1f476b7f4fde379d647b406cf5","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",9,,,,,
+,"8592abf0fdcf42bde87f310dc93e40b8","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",8,,,,,
+,"b82ccac524fdaddca4a50db7149556f0","tt_content",300,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",7,,,,,
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 ef3951ec64859648deabaee6f09c1c8756f5ca84..dcb8e2a6dd81b3fcd53cb31d9b4a6af5f67d5c60 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
@@ -28,7 +28,22 @@
,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
,14,89,1,0,0,0,13,0,0,0,0,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
"sys_refindex",,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,
-,"8d75f94b9d17c650dc9bfa6a3f84e254","tt_content",299,"tx_irretutorial_1nff_hotels",0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,
-,"79cc995658ae92af7fa70085b8758270","tx_irretutorial_1nff_offer",9,"prices",0,0,0,"tx_irretutorial_1nff_price",14,,,,,,,,
-,"a0cfe1ce39be83687c92da2f4bd64df7","tx_irretutorial_1nff_hotel",6,"offers",0,0,0,"tx_irretutorial_1nff_offer",9,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,,,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,,,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,
+,"79cc995658ae92af7fa70085b8758270","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",14,,,,,
+,"a0cfe1ce39be83687c92da2f4bd64df7","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",9,,,,,
+,"8d75f94b9d17c650dc9bfa6a3f84e254","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
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 5c87bc2365ca9e279e2eea9a58e0f7d93238ab46..6caf3928077ef3295eead8e4e8d9424031e2e9d7 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
@@ -34,7 +34,22 @@
,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
,14,90,1,0,0,13,0,0,0,0,0,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
"sys_refindex",,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,
-,"8d75f94b9d17c650dc9bfa6a3f84e254","tt_content",299,"tx_irretutorial_1nff_hotels",0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,
-,"79cc995658ae92af7fa70085b8758270","tx_irretutorial_1nff_offer",9,"prices",0,0,0,"tx_irretutorial_1nff_price",14,,,,,,,,
-,"a0cfe1ce39be83687c92da2f4bd64df7","tx_irretutorial_1nff_hotel",6,"offers",0,0,0,"tx_irretutorial_1nff_offer",9,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,,,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,,,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,
+,"79cc995658ae92af7fa70085b8758270","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",14,,,,,
+,"a0cfe1ce39be83687c92da2f4bd64df7","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",9,,,,,
+,"8d75f94b9d17c650dc9bfa6a3f84e254","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
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 a561d6ee6590cfe420c48f9a4958f7e8b7a67709..3d8669967ffce7265cdca00d26df69e2e5b95c11 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
@@ -28,12 +28,27 @@
,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
,14,89,1,0,1,0,13,0,0,0,0,0,"[Translate to Dansk:] Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
"sys_refindex",,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"46b6914e86268da4acdd7ccbf281bc91","tx_irretutorial_1nff_price",14,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"452f53179e104b4875a006167e37c204","tx_irretutorial_1nff_offer",9,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"79cc995658ae92af7fa70085b8758270","tx_irretutorial_1nff_offer",9,"prices",0,0,0,"tx_irretutorial_1nff_price",14,,,,,,,,
-,"487e5b17e1948485a88f9a2d2f161cdf","tx_irretutorial_1nff_hotel",6,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"a0cfe1ce39be83687c92da2f4bd64df7","tx_irretutorial_1nff_hotel",6,"offers",0,0,0,"tx_irretutorial_1nff_offer",9,,,,,,,,
-,"8d75f94b9d17c650dc9bfa6a3f84e254","tt_content",299,"tx_irretutorial_1nff_hotels",0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,,,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,,,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,
+,"46b6914e86268da4acdd7ccbf281bc91","tx_irretutorial_1nff_price",14,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,
+,"452f53179e104b4875a006167e37c204","tx_irretutorial_1nff_offer",9,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,
+,"79cc995658ae92af7fa70085b8758270","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",14,,,,,
+,"487e5b17e1948485a88f9a2d2f161cdf","tx_irretutorial_1nff_hotel",6,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,
+,"a0cfe1ce39be83687c92da2f4bd64df7","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",9,,,,,
+,"8d75f94b9d17c650dc9bfa6a3f84e254","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
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 d201b85e2b7e920588cdd4f49e17a2753ac9e9f5..61da409267db38e94cc708835cc34545bdeec1df 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
@@ -30,8 +30,23 @@
,12,89,1,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
"sys_refindex",,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,
-,"8d75f94b9d17c650dc9bfa6a3f84e254","tt_content",299,"tx_irretutorial_1nff_hotels",0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,
-,"a0cfe1ce39be83687c92da2f4bd64df7","tx_irretutorial_1nff_hotel",6,"offers",0,0,0,"tx_irretutorial_1nff_offer",9,,,,,,,,
-,"8e6a63d82781c428ec4fedaf606f294f","tt_content",300,"tx_irretutorial_1nff_hotels",0,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,,,
-,"edc6312799bb1d392a4eb4d9d437d56e","tx_irretutorial_1nff_hotel",7,"offers",0,0,0,"tx_irretutorial_1nff_offer",10,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,,,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,,,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,
+,"8d75f94b9d17c650dc9bfa6a3f84e254","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
+,"a0cfe1ce39be83687c92da2f4bd64df7","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",9,,,,,
+,"edc6312799bb1d392a4eb4d9d437d56e","tx_irretutorial_1nff_hotel",7,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",10,,,,,
+,"8e6a63d82781c428ec4fedaf606f294f","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",7,,,,,
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 3453e9611e781459960686afe15944eb8f823856..ab17dd3f056d40113abc320b45637ff1ed4e7a5a 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
@@ -30,15 +30,30 @@
,12,89,1,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
"sys_refindex",,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"8d75f94b9d17c650dc9bfa6a3f84e254","tt_content",299,"tx_irretutorial_1nff_hotels",0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,
-,"a0cfe1ce39be83687c92da2f4bd64df7","tx_irretutorial_1nff_hotel",6,"offers",0,0,0,"tx_irretutorial_1nff_offer",9,,,,,,,,
-,"bf63d4e8c53659e1d45a27402a41be3b","tx_irretutorial_1nff_offer",10,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"b80d2286a1228c523ff1c0e20c2b8ab8","tx_irretutorial_1nff_offer",10,"l18n_parent",0,0,0,"tx_irretutorial_1nff_offer",9,,,,,,,,
-,"6b28c82d72798c1ac145b0ef02c311ee","tx_irretutorial_1nff_hotel",7,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"4f44d74756ecf87a6dac243f4cdd935f","tx_irretutorial_1nff_hotel",7,"l18n_parent",0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,
-,"edc6312799bb1d392a4eb4d9d437d56e","tx_irretutorial_1nff_hotel",7,"offers",0,0,0,"tx_irretutorial_1nff_offer",10,,,,,,,,
-,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",0,0,0,"tt_content",299,,,,,,,,
-,"8e6a63d82781c428ec4fedaf606f294f","tt_content",300,"tx_irretutorial_1nff_hotels",0,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,,,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,,,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,
+,"8d75f94b9d17c650dc9bfa6a3f84e254","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
+,"a0cfe1ce39be83687c92da2f4bd64df7","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",9,,,,,
+,"bf63d4e8c53659e1d45a27402a41be3b","tx_irretutorial_1nff_offer",10,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,
+,"b80d2286a1228c523ff1c0e20c2b8ab8","tx_irretutorial_1nff_offer",10,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_offer",9,,,,,
+,"6b28c82d72798c1ac145b0ef02c311ee","tx_irretutorial_1nff_hotel",7,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,
+,"4f44d74756ecf87a6dac243f4cdd935f","tx_irretutorial_1nff_hotel",7,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
+,"edc6312799bb1d392a4eb4d9d437d56e","tx_irretutorial_1nff_hotel",7,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",10,,,,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,,,,
+,"8e6a63d82781c428ec4fedaf606f294f","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",7,,,,,
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 f4b593f0c4564a62ad4ac81899749bb249db166f..fe79cc7e64ba53fb67e411f27a8ad29691b6b202 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
@@ -30,15 +30,30 @@
,12,89,1,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
"sys_refindex",,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"8d75f94b9d17c650dc9bfa6a3f84e254","tt_content",299,"tx_irretutorial_1nff_hotels",0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,
-,"a0cfe1ce39be83687c92da2f4bd64df7","tx_irretutorial_1nff_hotel",6,"offers",0,0,0,"tx_irretutorial_1nff_offer",9,,,,,,,,
-,"bf63d4e8c53659e1d45a27402a41be3b","tx_irretutorial_1nff_offer",10,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"b80d2286a1228c523ff1c0e20c2b8ab8","tx_irretutorial_1nff_offer",10,"l18n_parent",0,0,0,"tx_irretutorial_1nff_offer",9,,,,,,,,
-,"6b28c82d72798c1ac145b0ef02c311ee","tx_irretutorial_1nff_hotel",7,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"4f44d74756ecf87a6dac243f4cdd935f","tx_irretutorial_1nff_hotel",7,"l18n_parent",0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,
-,"edc6312799bb1d392a4eb4d9d437d56e","tx_irretutorial_1nff_hotel",7,"offers",0,0,0,"tx_irretutorial_1nff_offer",10,,,,,,,,
-,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",0,0,0,"tt_content",299,,,,,,,,
-,"8e6a63d82781c428ec4fedaf606f294f","tt_content",300,"tx_irretutorial_1nff_hotels",0,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,,,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,,,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,
+,"8d75f94b9d17c650dc9bfa6a3f84e254","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
+,"a0cfe1ce39be83687c92da2f4bd64df7","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",9,,,,,
+,"bf63d4e8c53659e1d45a27402a41be3b","tx_irretutorial_1nff_offer",10,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,
+,"b80d2286a1228c523ff1c0e20c2b8ab8","tx_irretutorial_1nff_offer",10,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_offer",9,,,,,
+,"6b28c82d72798c1ac145b0ef02c311ee","tx_irretutorial_1nff_hotel",7,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,
+,"4f44d74756ecf87a6dac243f4cdd935f","tx_irretutorial_1nff_hotel",7,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
+,"edc6312799bb1d392a4eb4d9d437d56e","tx_irretutorial_1nff_hotel",7,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",10,,,,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,,,,
+,"8e6a63d82781c428ec4fedaf606f294f","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",7,,,,,
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 a93f3488c562f4a185492da54520147cf581ae49..1d9af94cac22775cbcb2467ad4ed4de51f5d76ec 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
@@ -4,4 +4,19 @@
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",1
,299,89,128,0,0,0,0,0,0,0,0,0,"Testing #1",0
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,
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 6def4b8954f6cbc575bba2c21f011478b049592d..daa9b0665c3a535edaee6dd55f5905aff5173b4a 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
@@ -27,6 +27,21 @@
,12,89,1,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
"sys_refindex",,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,
-,"8d75f94b9d17c650dc9bfa6a3f84e254","tt_content",299,"tx_irretutorial_1nff_hotels",0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,
-,"a0cfe1ce39be83687c92da2f4bd64df7","tx_irretutorial_1nff_hotel",6,"offers",0,0,0,"tx_irretutorial_1nff_offer",9,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,,,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,,,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,
+,"8d75f94b9d17c650dc9bfa6a3f84e254","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
+,"a0cfe1ce39be83687c92da2f4bd64df7","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",9,,,,,
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 4954dec18735e0d0bf629d49a24808e2418b21d6..ee8854f48531cfc868b1f09762828d9435f7f2d5 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
@@ -30,4 +30,4 @@
,12,89,1,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
,13,89,1,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
"sys_refindex",,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,
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 053fb5f5db3e2c83c8aeb49df2548dbba5729f1d..49b02b71cb3d59af3cb81cf1f6d25dc0f609f725 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
@@ -24,4 +24,16 @@
,12,89,1,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
,13,89,1,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
"sys_refindex",,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,,,,
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 97eaff2cf479ca94558507957e69da34d80619bc..70cf4fce79c3f4f1a2b002cf66ed607946e0a1d8 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
@@ -1,80 +1,95 @@
-"pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","tx_irretutorial_hotels","l10n_state",,
-,1,0,256,0,0,0,0,0,0,0,0,0,"FunctionalTest",0,,,
-,88,1,256,0,0,0,0,0,0,0,0,0,"DataHandlerTest",0,,,
-,89,88,256,0,0,0,0,0,0,0,0,0,"Relations",1,,,
-,90,88,512,0,0,0,0,0,0,0,0,0,"Target",0,,,
-,91,88,256,0,1,89,0,0,0,0,0,0,"[Translate to Dansk:] Relations",1,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_irretutorial_hotels"":""parent""}",,
-,92,90,256,0,0,0,89,0,0,0,0,0,"Relations",1,,,
-,93,90,256,0,1,92,91,0,0,0,0,0,"[Translate to Dansk:] Relations",1,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_irretutorial_hotels"":""parent""}",,
-"tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1nff_hotels",,,
-,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
-,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-,299,92,256,0,0,0,298,0,0,0,0,0,"Regular Element #2",1,,,
-,300,92,128,0,0,0,297,0,0,0,0,0,"Regular Element #1",2,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier","offers"
-,2,89,1,0,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,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,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,2,2,0,0,0,0,0,"[Translate to Dansk:] Hotel #0",91,"pages",,0
-,7,92,1,0,0,0,2,0,0,0,0,0,"Hotel #0",92,"pages",,0
-,8,92,1,0,1,7,6,0,0,0,0,0,"[Translate to Dansk:] Hotel #0",93,"pages",,0
-,9,92,1,0,0,0,5,0,0,0,0,0,"Hotel #1",299,"tt_content",,1
-,10,92,1,0,0,0,3,0,0,0,0,0,"Hotel #1",300,"tt_content",,2
-,11,92,2,0,0,0,4,0,0,0,0,0,"Hotel #2",300,"tt_content",,1
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","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
-,6,89,2,0,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,9,92,1,0,0,0,8,0,0,0,0,0,"Offer #1.1",9,"tx_irretutorial_1nff_hotel",,1
-,10,92,1,0,0,0,5,0,0,0,0,0,"Offer #1.1",10,"tx_irretutorial_1nff_hotel",,3
-,11,92,2,0,0,0,6,0,0,0,0,0,"Offer #1.2",10,"tx_irretutorial_1nff_hotel",,2
-,12,92,1,0,0,0,7,0,0,0,0,0,"Offer #2.1",11,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
-,14,92,1,0,0,0,13,0,0,0,0,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
-,15,92,1,0,0,0,7,0,0,0,0,0,"Price #1.1.1",10,"tx_irretutorial_1nff_offer",,
-,16,92,2,0,0,0,8,0,0,0,0,0,"Price #1.1.2",10,"tx_irretutorial_1nff_offer",,
-,17,92,3,0,0,0,9,0,0,0,0,0,"Price #1.1.3",10,"tx_irretutorial_1nff_offer",,
-,18,92,1,0,0,0,10,0,0,0,0,0,"Price #1.2.1",11,"tx_irretutorial_1nff_offer",,
-,19,92,2,0,0,0,11,0,0,0,0,0,"Price #1.2.2",11,"tx_irretutorial_1nff_offer",,
-,20,92,1,0,0,0,12,0,0,0,0,0,"Price #2.1.1",12,"tx_irretutorial_1nff_offer",,
-"sys_refindex",,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,
-,"487e5b17e1948485a88f9a2d2f161cdf","tx_irretutorial_1nff_hotel",6,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"5f12a830d447ebd01de57dea5b6c24b6","tx_irretutorial_1nff_hotel",6,"l18n_parent",0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"821e210a4b42d0bd2605f5ab998cbe65","pages",91,"tx_irretutorial_hotels",0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,
-,"cf379014ad3a47e1889071270ae13b74","pages",92,"tx_irretutorial_hotels",0,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,,,
-,"36477ae527b8a8ddd6f3a4f59d61b4b4","tx_irretutorial_1nff_hotel",8,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"d0bc06b71f765fd230f63a9dc847c7fe","pages",93,"l10n_parent",0,0,0,"pages",92,,,,,,,,
-,"2376b105383bdfe30bf66df5d704a7be","pages",93,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"dc64f1795d5b081fbc3f627073e5353d","pages",93,"tx_irretutorial_hotels",0,0,0,"tx_irretutorial_1nff_hotel",8,,,,,,,,
-,"1b437d1f476b7f4fde379d647b406cf5","tt_content",299,"tx_irretutorial_1nff_hotels",0,0,0,"tx_irretutorial_1nff_hotel",9,,,,,,,,
-,"355fd3386f3e72ea50da8c95aa7b530b","tt_content",300,"tx_irretutorial_1nff_hotels",0,0,0,"tx_irretutorial_1nff_hotel",10,,,,,,,,
-,"ef9eb58d54d372eddafb6f430a96c905","tt_content",300,"tx_irretutorial_1nff_hotels",1,0,0,"tx_irretutorial_1nff_hotel",11,,,,,,,,
-,"79cc995658ae92af7fa70085b8758270","tx_irretutorial_1nff_offer",9,"prices",0,0,0,"tx_irretutorial_1nff_price",14,,,,,,,,
-,"c965ea8d9792dcbf353ad192011e28b1","tx_irretutorial_1nff_hotel",9,"offers",0,0,0,"tx_irretutorial_1nff_offer",9,,,,,,,,
-,"832e8f4e4020734e194fc9f4a3e1ba6a","tx_irretutorial_1nff_offer",10,"prices",0,0,0,"tx_irretutorial_1nff_price",15,,,,,,,,
-,"2b725e5999eee3bf86abca511c98d452","tx_irretutorial_1nff_offer",10,"prices",1,0,0,"tx_irretutorial_1nff_price",16,,,,,,,,
-,"f1b087504f89d0cc06bfa5999d30fb96","tx_irretutorial_1nff_offer",10,"prices",2,0,0,"tx_irretutorial_1nff_price",17,,,,,,,,
-,"27282ca3b14b1aa771ff89a520b2ad2e","tx_irretutorial_1nff_offer",11,"prices",0,0,0,"tx_irretutorial_1nff_price",18,,,,,,,,
-,"4e77986a21f02bed02af7a43326b08c1","tx_irretutorial_1nff_offer",11,"prices",1,0,0,"tx_irretutorial_1nff_price",19,,,,,,,,
-,"85f7f7a20d29e07040e541911189238e","tx_irretutorial_1nff_hotel",10,"offers",0,0,0,"tx_irretutorial_1nff_offer",10,,,,,,,,
-,"d87e89006feb784903a308ec82664d09","tx_irretutorial_1nff_hotel",10,"offers",1,0,0,"tx_irretutorial_1nff_offer",11,,,,,,,,
-,"738d681b5ae88b8addad9baf0b0ac4b7","tx_irretutorial_1nff_offer",12,"prices",0,0,0,"tx_irretutorial_1nff_price",20,,,,,,,,
-,"99116322388206e0d951359ba35581d8","tx_irretutorial_1nff_hotel",11,"offers",0,0,0,"tx_irretutorial_1nff_offer",12,,,,,,,,
-,"86f2aa617f20f99cbe04d2c8913efe75","tx_irretutorial_1nff_hotel",8,"l18n_parent",0,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,,,
+"pages",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","tx_irretutorial_hotels","l10n_state",,,,,,,,,,,,,
+,1,0,256,0,0,0,0,0,0,0,0,0,"FunctionalTest",0,,,,,,,,,,,,,,
+,88,1,256,0,0,0,0,0,0,0,0,0,"DataHandlerTest",0,,,,,,,,,,,,,,
+,89,88,256,0,0,0,0,0,0,0,0,0,"Relations",1,,,,,,,,,,,,,,
+,90,88,512,0,0,0,0,0,0,0,0,0,"Target",0,,,,,,,,,,,,,,
+,91,88,256,0,1,89,0,0,0,0,0,0,"[Translate to Dansk:] Relations",1,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_irretutorial_hotels"":""parent""}",,,,,,,,,,,,,
+,92,90,256,0,0,0,89,0,0,0,0,0,"Relations",1,,,,,,,,,,,,,,
+,93,90,256,0,1,92,91,0,0,0,0,0,"[Translate to Dansk:] Relations",1,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_irretutorial_hotels"":""parent""}",,,,,,,,,,,,,
+"tt_content",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1nff_hotels",,,,,,,,,,,,,,
+,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,,,,,,,
+,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,,,,,,,,,,
+,299,92,256,0,0,0,298,0,0,0,0,0,"Regular Element #2",1,,,,,,,,,,,,,,
+,300,92,128,0,0,0,297,0,0,0,0,0,"Regular Element #1",2,,,,,,,,,,,,,,
+"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier","offers",,,,,,,,,,,
+,2,89,1,0,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,,,,,,,,,,
+,3,89,1,0,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,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,2,2,0,0,0,0,0,"[Translate to Dansk:] Hotel #0",91,"pages",,0,,,,,,,,,,,
+,7,92,1,0,0,0,2,0,0,0,0,0,"Hotel #0",92,"pages",,0,,,,,,,,,,,
+,8,92,1,0,1,7,6,0,0,0,0,0,"[Translate to Dansk:] Hotel #0",93,"pages",,0,,,,,,,,,,,
+,9,92,1,0,0,0,5,0,0,0,0,0,"Hotel #1",299,"tt_content",,1,,,,,,,,,,,
+,10,92,1,0,0,0,3,0,0,0,0,0,"Hotel #1",300,"tt_content",,2,,,,,,,,,,,
+,11,92,2,0,0,0,4,0,0,0,0,0,"Hotel #2",300,"tt_content",,1,,,,,,,,,,,
+"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","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,,,,,,,,,,,
+,6,89,2,0,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,,,,,,,,,,
+,7,89,1,0,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,,,,,,,,,,
+,8,89,1,0,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,,,,,,,,,,
+,9,92,1,0,0,0,8,0,0,0,0,0,"Offer #1.1",9,"tx_irretutorial_1nff_hotel",,1,,,,,,,,,,,
+,10,92,1,0,0,0,5,0,0,0,0,0,"Offer #1.1",10,"tx_irretutorial_1nff_hotel",,3,,,,,,,,,,,
+,11,92,2,0,0,0,6,0,0,0,0,0,"Offer #1.2",10,"tx_irretutorial_1nff_hotel",,2,,,,,,,,,,,
+,12,92,1,0,0,0,7,0,0,0,0,0,"Offer #2.1",11,"tx_irretutorial_1nff_hotel",,1,,,,,,,,,,,
+"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier",,,,,,,,,,,,
+,7,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,8,89,2,0,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,9,89,3,0,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,10,89,1,0,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,11,89,2,0,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,12,89,1,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,14,92,1,0,0,0,13,0,0,0,0,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,15,92,1,0,0,0,7,0,0,0,0,0,"Price #1.1.1",10,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,16,92,2,0,0,0,8,0,0,0,0,0,"Price #1.1.2",10,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,17,92,3,0,0,0,9,0,0,0,0,0,"Price #1.1.3",10,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,18,92,1,0,0,0,10,0,0,0,0,0,"Price #1.2.1",11,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,19,92,2,0,0,0,11,0,0,0,0,0,"Price #1.2.2",11,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,20,92,1,0,0,0,12,0,0,0,0,0,"Price #2.1.1",12,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+"sys_refindex",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,,,,,,,,,,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,,,,,,,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,,,,,,,,,,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,,,,,,,,,,,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,,,,,,,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,,,,,,,,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,,,,,,,,,,,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,,,,,,,,,,,,,,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,,,,,,,,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,,,,,,,,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,,,,,,,,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,,,,,,,,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,,,,,,,,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,,,,,,,,,,,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,,,,,,,,,,,,,,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,,,,,,,,,,,,
+,"487e5b17e1948485a88f9a2d2f161cdf","tx_irretutorial_1nff_hotel",6,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,,,,,,,,,,,
+,"5f12a830d447ebd01de57dea5b6c24b6","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,,,,,,,,,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,,,,,,,,,,,,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,,,,,,,,,,,
+,"821e210a4b42d0bd2605f5ab998cbe65","pages",91,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,,,,,,,,,
+,"36477ae527b8a8ddd6f3a4f59d61b4b4","tx_irretutorial_1nff_hotel",8,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,,,,,,,,,,,
+,"86f2aa617f20f99cbe04d2c8913efe75","tx_irretutorial_1nff_hotel",8,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,,,,,,,,,,,
+,"c965ea8d9792dcbf353ad192011e28b1","tx_irretutorial_1nff_hotel",9,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",9,,,,,,,,,,,,,,,,
+,"85f7f7a20d29e07040e541911189238e","tx_irretutorial_1nff_hotel",10,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",10,,,,,,,,,,,,,,,,
+,"d87e89006feb784903a308ec82664d09","tx_irretutorial_1nff_hotel",10,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",11,,,,,,,,,,,,,,,,
+,"99116322388206e0d951359ba35581d8","tx_irretutorial_1nff_hotel",11,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",12,,,,,,,,,,,,,,,,
+,"cf379014ad3a47e1889071270ae13b74","pages",92,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,,,,,,,,,,,
+,"d0bc06b71f765fd230f63a9dc847c7fe","pages",93,"l10n_parent",,,,0,0,0,"pages",92,,,,,,,,,,,,,,,,
+,"2376b105383bdfe30bf66df5d704a7be","pages",93,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,,,,,,,,,,,
+,"dc64f1795d5b081fbc3f627073e5353d","pages",93,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",8,,,,,,,,,,,,,,,,
+,"79cc995658ae92af7fa70085b8758270","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",14,,,,,,,,,,,,,,,,
+,"832e8f4e4020734e194fc9f4a3e1ba6a","tx_irretutorial_1nff_offer",10,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",15,,,,,,,,,,,,,,,,
+,"2b725e5999eee3bf86abca511c98d452","tx_irretutorial_1nff_offer",10,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",16,,,,,,,,,,,,,,,,
+,"f1b087504f89d0cc06bfa5999d30fb96","tx_irretutorial_1nff_offer",10,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",17,,,,,,,,,,,,,,,,
+,"27282ca3b14b1aa771ff89a520b2ad2e","tx_irretutorial_1nff_offer",11,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",18,,,,,,,,,,,,,,,,
+,"4e77986a21f02bed02af7a43326b08c1","tx_irretutorial_1nff_offer",11,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",19,,,,,,,,,,,,,,,,
+,"738d681b5ae88b8addad9baf0b0ac4b7","tx_irretutorial_1nff_offer",12,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",20,,,,,,,,,,,,,,,,
+,"1b437d1f476b7f4fde379d647b406cf5","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",9,,,,,,,,,,,,,,,,
+,"355fd3386f3e72ea50da8c95aa7b530b","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",10,,,,,,,,,,,,,,,,
+,"ef9eb58d54d372eddafb6f430a96c905","tt_content",300,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",11,,,,,,,,,,,,,,,,
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 50da6988e1791b306aa774c45fafabf370eee064..bfc24e5a48da4c94eca1f7a36491c274e2fd236d 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
@@ -1,85 +1,99 @@
-"pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","tx_irretutorial_hotels","l10n_state",,
-,1,0,256,0,0,0,0,0,0,0,0,0,"FunctionalTest",0,,,
-,88,1,256,0,0,0,0,0,0,0,0,0,"DataHandlerTest",0,,,
-,89,88,256,0,0,0,0,0,0,0,0,0,"Relations",2,,,
-,90,88,512,0,0,0,0,0,0,0,0,0,"Target",0,,,
-,91,88,256,0,1,89,0,0,0,0,0,0,"[Translate to Dansk:] Relations",2,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_irretutorial_hotels"":""parent""}",,
-,92,90,256,0,0,0,89,0,0,0,0,0,"Relations",2,,,
-,93,90,256,0,1,92,91,0,0,0,0,0,"[Translate to Dansk:] Relations",2,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_irretutorial_hotels"":""parent""}",,
-"tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1nff_hotels",,,
-,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
-,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-,299,92,256,0,0,0,298,0,0,0,0,0,"Regular Element #2",1,,,
-,300,92,128,0,0,0,297,0,0,0,0,0,"Regular Element #1",2,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier","offers"
-,2,89,1,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,1026,0,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,0,"Hotel #1",298,"tt_content",,1
-,6,89,1,0,0,0,2,0,0,0,0,0,"Hotel #0",91,"pages",,0
-,7,89,2,0,0,0,0,0,0,0,0,0,"Hotel #007",89,"pages",,0
-,8,89,2,0,0,0,0,0,0,0,0,0,"Hotel #007",91,"pages",,0
-,9,92,1,0,0,0,2,0,0,0,0,0,"Hotel #0",92,"pages",,0
-,10,92,2,0,0,0,7,0,0,0,0,0,"Hotel #007",92,"pages",,0
-,11,92,1,0,0,0,6,0,0,0,0,0,"Hotel #0",93,"pages",,0
-,12,92,2,0,0,0,8,0,0,0,0,0,"Hotel #007",93,"pages",,0
-,13,92,1,0,0,0,5,0,0,0,0,0,"Hotel #1",299,"tt_content",,1
-,14,92,1,0,0,0,3,0,0,0,0,0,"Hotel #1",300,"tt_content",,2
-,15,92,2,0,0,0,4,0,0,0,0,0,"Hotel #2",300,"tt_content",,1
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","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
-,6,89,2,0,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,9,92,1,0,0,0,8,0,0,0,0,0,"Offer #1.1",13,"tx_irretutorial_1nff_hotel",,1
-,10,92,1,0,0,0,5,0,0,0,0,0,"Offer #1.1",14,"tx_irretutorial_1nff_hotel",,3
-,11,92,2,0,0,0,6,0,0,0,0,0,"Offer #1.2",14,"tx_irretutorial_1nff_hotel",,2
-,12,92,1,0,0,0,7,0,0,0,0,0,"Offer #2.1",15,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
-,14,92,1,0,0,0,13,0,0,0,0,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
-,15,92,1,0,0,0,7,0,0,0,0,0,"Price #1.1.1",10,"tx_irretutorial_1nff_offer",,
-,16,92,2,0,0,0,8,0,0,0,0,0,"Price #1.1.2",10,"tx_irretutorial_1nff_offer",,
-,17,92,3,0,0,0,9,0,0,0,0,0,"Price #1.1.3",10,"tx_irretutorial_1nff_offer",,
-,18,92,1,0,0,0,10,0,0,0,0,0,"Price #1.2.1",11,"tx_irretutorial_1nff_offer",,
-,19,92,2,0,0,0,11,0,0,0,0,0,"Price #1.2.2",11,"tx_irretutorial_1nff_offer",,
-,20,92,1,0,0,0,12,0,0,0,0,0,"Price #2.1.1",12,"tx_irretutorial_1nff_offer",,
-"sys_refindex",,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"821e210a4b42d0bd2605f5ab998cbe65","pages",91,"tx_irretutorial_hotels",0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,
-,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,,,
-,"af375c778117c206674c84b69850dcb5","pages",89,"tx_irretutorial_hotels",1,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,,,
-,"cd6205659b16fe05d5adf2df0fdf0842","pages",91,"tx_irretutorial_hotels",1,0,0,"tx_irretutorial_1nff_hotel",8,,,,,,,,
-,"c0eb8a12965df03563a52426d5a7a4fa","pages",92,"tx_irretutorial_hotels",0,0,0,"tx_irretutorial_1nff_hotel",9,,,,,,,,
-,"37d3bd8476b41d1c74e365dcb731500c","pages",92,"tx_irretutorial_hotels",1,0,0,"tx_irretutorial_1nff_hotel",10,,,,,,,,
-,"d0bc06b71f765fd230f63a9dc847c7fe","pages",93,"l10n_parent",0,0,0,"pages",92,,,,,,,,
-,"2376b105383bdfe30bf66df5d704a7be","pages",93,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"c4942b497ca2d44569596d3279dd450a","pages",93,"tx_irretutorial_hotels",0,0,0,"tx_irretutorial_1nff_hotel",11,,,,,,,,
-,"afb8d6c4ffab401cd65a53953699269c","pages",93,"tx_irretutorial_hotels",1,0,0,"tx_irretutorial_1nff_hotel",12,,,,,,,,
-,"b62e16e426ece430363b9e3c54a15d55","tt_content",299,"tx_irretutorial_1nff_hotels",0,0,0,"tx_irretutorial_1nff_hotel",13,,,,,,,,
-,"4eb7c6ee3bebd6c3e0896f7815070766","tt_content",300,"tx_irretutorial_1nff_hotels",0,0,0,"tx_irretutorial_1nff_hotel",14,,,,,,,,
-,"2ecdb2648ccf8824f11236f2391896c5","tt_content",300,"tx_irretutorial_1nff_hotels",1,0,0,"tx_irretutorial_1nff_hotel",15,,,,,,,,
-,"79cc995658ae92af7fa70085b8758270","tx_irretutorial_1nff_offer",9,"prices",0,0,0,"tx_irretutorial_1nff_price",14,,,,,,,,
-,"78d65b560054920b779e28cbe760880e","tx_irretutorial_1nff_hotel",13,"offers",0,0,0,"tx_irretutorial_1nff_offer",9,,,,,,,,
-,"832e8f4e4020734e194fc9f4a3e1ba6a","tx_irretutorial_1nff_offer",10,"prices",0,0,0,"tx_irretutorial_1nff_price",15,,,,,,,,
-,"2b725e5999eee3bf86abca511c98d452","tx_irretutorial_1nff_offer",10,"prices",1,0,0,"tx_irretutorial_1nff_price",16,,,,,,,,
-,"f1b087504f89d0cc06bfa5999d30fb96","tx_irretutorial_1nff_offer",10,"prices",2,0,0,"tx_irretutorial_1nff_price",17,,,,,,,,
-,"27282ca3b14b1aa771ff89a520b2ad2e","tx_irretutorial_1nff_offer",11,"prices",0,0,0,"tx_irretutorial_1nff_price",18,,,,,,,,
-,"4e77986a21f02bed02af7a43326b08c1","tx_irretutorial_1nff_offer",11,"prices",1,0,0,"tx_irretutorial_1nff_price",19,,,,,,,,
-,"c1cb56c3dc8f44765f45d2cc9b9bf2ef","tx_irretutorial_1nff_hotel",14,"offers",0,0,0,"tx_irretutorial_1nff_offer",10,,,,,,,,
-,"b41399aaa39264b750ac511807605a9b","tx_irretutorial_1nff_hotel",14,"offers",1,0,0,"tx_irretutorial_1nff_offer",11,,,,,,,,
-,"738d681b5ae88b8addad9baf0b0ac4b7","tx_irretutorial_1nff_offer",12,"prices",0,0,0,"tx_irretutorial_1nff_price",20,,,,,,,,
-,"3eae4a6692d875ca6081652edc52c3b0","tx_irretutorial_1nff_hotel",15,"offers",0,0,0,"tx_irretutorial_1nff_offer",12,,,,,,,,
+"pages",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","tx_irretutorial_hotels","l10n_state",,,,,,,,,,,,,
+,1,0,256,0,0,0,0,0,0,0,0,0,"FunctionalTest",0,,,,,,,,,,,,,,
+,88,1,256,0,0,0,0,0,0,0,0,0,"DataHandlerTest",0,,,,,,,,,,,,,,
+,89,88,256,0,0,0,0,0,0,0,0,0,"Relations",2,,,,,,,,,,,,,,
+,90,88,512,0,0,0,0,0,0,0,0,0,"Target",0,,,,,,,,,,,,,,
+,91,88,256,0,1,89,0,0,0,0,0,0,"[Translate to Dansk:] Relations",2,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_irretutorial_hotels"":""parent""}",,,,,,,,,,,,,
+,92,90,256,0,0,0,89,0,0,0,0,0,"Relations",2,,,,,,,,,,,,,,
+,93,90,256,0,1,92,91,0,0,0,0,0,"[Translate to Dansk:] Relations",2,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_irretutorial_hotels"":""parent""}",,,,,,,,,,,,,
+"tt_content",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1nff_hotels",,,,,,,,,,,,,,
+,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,,,,,,,
+,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,,,,,,,,,,
+,299,92,256,0,0,0,298,0,0,0,0,0,"Regular Element #2",1,,,,,,,,,,,,,,
+,300,92,128,0,0,0,297,0,0,0,0,0,"Regular Element #1",2,,,,,,,,,,,,,,
+"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier","offers",,,,,,,,,,,
+,2,89,1,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,1026,0,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,0,"Hotel #1",298,"tt_content",,1,,,,,,,,,,,
+,6,89,1,0,0,0,2,0,0,0,0,0,"Hotel #0",91,"pages",,0,,,,,,,,,,,
+,7,89,2,0,0,0,0,0,0,0,0,0,"Hotel #007",89,"pages",,0,,,,,,,,,,,
+,8,89,2,0,0,0,0,0,0,0,0,0,"Hotel #007",91,"pages",,0,,,,,,,,,,,
+,9,92,1,0,0,0,2,0,0,0,0,0,"Hotel #0",92,"pages",,0,,,,,,,,,,,
+,10,92,2,0,0,0,7,0,0,0,0,0,"Hotel #007",92,"pages",,0,,,,,,,,,,,
+,11,92,1,0,0,0,6,0,0,0,0,0,"Hotel #0",93,"pages",,0,,,,,,,,,,,
+,12,92,2,0,0,0,8,0,0,0,0,0,"Hotel #007",93,"pages",,0,,,,,,,,,,,
+,13,92,1,0,0,0,5,0,0,0,0,0,"Hotel #1",299,"tt_content",,1,,,,,,,,,,,
+,14,92,1,0,0,0,3,0,0,0,0,0,"Hotel #1",300,"tt_content",,2,,,,,,,,,,,
+,15,92,2,0,0,0,4,0,0,0,0,0,"Hotel #2",300,"tt_content",,1,,,,,,,,,,,
+"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","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,,,,,,,,,,,
+,6,89,2,0,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,,,,,,,,,,
+,7,89,1,0,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,,,,,,,,,,
+,8,89,1,0,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,,,,,,,,,,
+,9,92,1,0,0,0,8,0,0,0,0,0,"Offer #1.1",13,"tx_irretutorial_1nff_hotel",,1,,,,,,,,,,,
+,10,92,1,0,0,0,5,0,0,0,0,0,"Offer #1.1",14,"tx_irretutorial_1nff_hotel",,3,,,,,,,,,,,
+,11,92,2,0,0,0,6,0,0,0,0,0,"Offer #1.2",14,"tx_irretutorial_1nff_hotel",,2,,,,,,,,,,,
+,12,92,1,0,0,0,7,0,0,0,0,0,"Offer #2.1",15,"tx_irretutorial_1nff_hotel",,1,,,,,,,,,,,
+"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier",,,,,,,,,,,,
+,7,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,8,89,2,0,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,9,89,3,0,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,10,89,1,0,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,11,89,2,0,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,12,89,1,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,14,92,1,0,0,0,13,0,0,0,0,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,15,92,1,0,0,0,7,0,0,0,0,0,"Price #1.1.1",10,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,16,92,2,0,0,0,8,0,0,0,0,0,"Price #1.1.2",10,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,17,92,3,0,0,0,9,0,0,0,0,0,"Price #1.1.3",10,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,18,92,1,0,0,0,10,0,0,0,0,0,"Price #1.2.1",11,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,19,92,2,0,0,0,11,0,0,0,0,0,"Price #1.2.2",11,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,20,92,1,0,0,0,12,0,0,0,0,0,"Price #2.1.1",12,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+"sys_refindex",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,,,,,,,,,,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,,,,,,,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,,,,,,,,,,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,,,,,,,,,,,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,,,,,,,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,,,,,,,,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,,,,,,,,,,,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,,,,,,,,,,,,,,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,,,,,,,,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,,,,,,,,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,,,,,,,,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,,,,,,,,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,,,,,,,,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,,,,,,,,,,,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,,,,,,,,,,,,,,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,,,,,,,,,,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,,,,,,,,,,,,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,,,,,,,,,,,
+,"821e210a4b42d0bd2605f5ab998cbe65","pages",91,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,,,,,,,,,
+,"af375c778117c206674c84b69850dcb5","pages",89,"tx_irretutorial_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,,,,,,,,,,,
+,"cd6205659b16fe05d5adf2df0fdf0842","pages",91,"tx_irretutorial_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",8,,,,,,,,,,,,,,,,
+,"78d65b560054920b779e28cbe760880e","tx_irretutorial_1nff_hotel",13,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",9,,,,,,,,,,,,,,,,
+,"c1cb56c3dc8f44765f45d2cc9b9bf2ef","tx_irretutorial_1nff_hotel",14,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",10,,,,,,,,,,,,,,,,
+,"b41399aaa39264b750ac511807605a9b","tx_irretutorial_1nff_hotel",14,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",11,,,,,,,,,,,,,,,,
+,"3eae4a6692d875ca6081652edc52c3b0","tx_irretutorial_1nff_hotel",15,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",12,,,,,,,,,,,,,,,,
+,"c0eb8a12965df03563a52426d5a7a4fa","pages",92,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",9,,,,,,,,,,,,,,,,
+,"37d3bd8476b41d1c74e365dcb731500c","pages",92,"tx_irretutorial_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",10,,,,,,,,,,,,,,,,
+,"d0bc06b71f765fd230f63a9dc847c7fe","pages",93,"l10n_parent",,,,0,0,0,"pages",92,,,,,,,,,,,,,,,,
+,"2376b105383bdfe30bf66df5d704a7be","pages",93,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,,,,,,,,,,,
+,"c4942b497ca2d44569596d3279dd450a","pages",93,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",11,,,,,,,,,,,,,,,,
+,"afb8d6c4ffab401cd65a53953699269c","pages",93,"tx_irretutorial_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",12,,,,,,,,,,,,,,,,
+,"79cc995658ae92af7fa70085b8758270","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",14,,,,,,,,,,,,,,,,
+,"832e8f4e4020734e194fc9f4a3e1ba6a","tx_irretutorial_1nff_offer",10,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",15,,,,,,,,,,,,,,,,
+,"2b725e5999eee3bf86abca511c98d452","tx_irretutorial_1nff_offer",10,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",16,,,,,,,,,,,,,,,,
+,"f1b087504f89d0cc06bfa5999d30fb96","tx_irretutorial_1nff_offer",10,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",17,,,,,,,,,,,,,,,,
+,"27282ca3b14b1aa771ff89a520b2ad2e","tx_irretutorial_1nff_offer",11,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",18,,,,,,,,,,,,,,,,
+,"4e77986a21f02bed02af7a43326b08c1","tx_irretutorial_1nff_offer",11,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",19,,,,,,,,,,,,,,,,
+,"738d681b5ae88b8addad9baf0b0ac4b7","tx_irretutorial_1nff_offer",12,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",20,,,,,,,,,,,,,,,,
+,"b62e16e426ece430363b9e3c54a15d55","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",13,,,,,,,,,,,,,,,,
+,"4eb7c6ee3bebd6c3e0896f7815070766","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",14,,,,,,,,,,,,,,,,
+,"2ecdb2648ccf8824f11236f2391896c5","tt_content",300,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",15,,,,,,,,,,,,,,,,
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 359a49c2ce487c25e9989d770e2dd4cb16d3fa00..99dafe2c2d4d0d0619ba9d0ce0c181ba19d03ad8 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
@@ -1,47 +1,61 @@
-"pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","tx_irretutorial_hotels","l10n_state",,
-,1,0,256,0,0,0,0,0,0,0,0,0,"FunctionalTest",0,,,
-,88,1,256,0,0,0,0,0,0,0,0,0,"DataHandlerTest",0,,,
-,89,88,256,0,0,0,0,0,0,0,0,0,"Relations",2,,,
-,90,88,512,0,0,0,0,0,0,0,0,0,"Target",0,,,
-,91,88,256,0,1,89,0,0,0,0,0,0,"[Translate to Dansk:] Relations",2,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent""}",,
-"tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1nff_hotels",,,
-,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
-,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier","offers"
-,2,89,1,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,1026,0,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,0,"Hotel #1",298,"tt_content",,1
-,6,89,1,0,1,2,2,0,0,0,0,0,"Hotel #0",91,"pages",,0
-,7,89,2,0,0,0,0,0,0,0,0,0,"Hotel #007",89,"pages",,0
-,8,89,2,0,1,7,0,0,0,0,0,0,"Hotel #007",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","t3ver_move_id","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
-,6,89,2,0,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
-"sys_refindex",,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"487e5b17e1948485a88f9a2d2f161cdf","tx_irretutorial_1nff_hotel",6,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"5f12a830d447ebd01de57dea5b6c24b6","tx_irretutorial_1nff_hotel",6,"l18n_parent",0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,,,
-,"821e210a4b42d0bd2605f5ab998cbe65","pages",91,"tx_irretutorial_hotels",0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,
-,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,,,
-,"36477ae527b8a8ddd6f3a4f59d61b4b4","tx_irretutorial_1nff_hotel",8,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"af375c778117c206674c84b69850dcb5","pages",89,"tx_irretutorial_hotels",1,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,,,
-,"cd6205659b16fe05d5adf2df0fdf0842","pages",91,"tx_irretutorial_hotels",1,0,0,"tx_irretutorial_1nff_hotel",8,,,,,,,,
-,"86f2aa617f20f99cbe04d2c8913efe75","tx_irretutorial_1nff_hotel",8,"l18n_parent",0,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,,,
+"pages",,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","tx_irretutorial_hotels","l10n_state",,,,,,,,,,,,
+,1,0,256,0,0,0,0,0,0,0,0,0,"FunctionalTest",0,,,,,,,,,,,,,
+,88,1,256,0,0,0,0,0,0,0,0,0,"DataHandlerTest",0,,,,,,,,,,,,,
+,89,88,256,0,0,0,0,0,0,0,0,0,"Relations",2,,,,,,,,,,,,,
+,90,88,512,0,0,0,0,0,0,0,0,0,"Target",0,,,,,,,,,,,,,
+,91,88,256,0,1,89,0,0,0,0,0,0,"[Translate to Dansk:] Relations",2,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent""}",,,,,,,,,,,,
+"tt_content",,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1nff_hotels",,,,,,,,,,,,,
+,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,,,,,,
+,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,,,,,,,,,
+"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier","offers",,,,,,,,,,
+,2,89,1,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,1026,0,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,0,"Hotel #1",298,"tt_content",,1,,,,,,,,,,
+,6,89,1,0,1,2,2,0,0,0,0,0,"Hotel #0",91,"pages",,0,,,,,,,,,,
+,7,89,2,0,0,0,0,0,0,0,0,0,"Hotel #007",89,"pages",,0,,,,,,,,,,
+,8,89,2,0,1,7,0,0,0,0,0,0,"Hotel #007",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","t3ver_move_id","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,,,,,,,,,,
+,6,89,2,0,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,,,,,,,,,
+,7,89,1,0,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,,,,,,,,,
+,8,89,1,0,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,,,,,,,,,
+"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier",,,,,,,,,,,
+,7,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,,,,,,,,,
+,8,89,2,0,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,,,,,,,,,
+,9,89,3,0,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,,,,,,,,,
+,10,89,1,0,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,,,,,,,,,
+,11,89,2,0,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,,,,,,,,,
+,12,89,1,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,,,,,,,,,
+,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,,,,,,,,,
+"sys_refindex",,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,,,,,,,,,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,,,,,,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,,,,,,,,,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,,,,,,,,,,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,,,,,,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,,,,,,,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,,,,,,,,,,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,,,,,,,,,,,,,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,,,,,,,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,,,,,,,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,,,,,,,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,,,,,,,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,,,,,,,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,,,,,,,,,,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,,,,,,,,,,,,,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,,,,,,,,,,,
+,"487e5b17e1948485a88f9a2d2f161cdf","tx_irretutorial_1nff_hotel",6,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,,,,,,,,,,
+,"5f12a830d447ebd01de57dea5b6c24b6","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,,,,,,,,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,,,,,,,,,,,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,,,,,,,,,,
+,"821e210a4b42d0bd2605f5ab998cbe65","pages",91,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,,,,,,,,
+,"af375c778117c206674c84b69850dcb5","pages",89,"tx_irretutorial_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,,,,,,,,,,
+,"cd6205659b16fe05d5adf2df0fdf0842","pages",91,"tx_irretutorial_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",8,,,,,,,,,,,,,,,
+,"36477ae527b8a8ddd6f3a4f59d61b4b4","tx_irretutorial_1nff_hotel",8,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,,,,,,,,,,
+,"86f2aa617f20f99cbe04d2c8913efe75","tx_irretutorial_1nff_hotel",8,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,,,,,,,,,,
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 baac7bb9928315e230c2c775a8a61c006525c5cf..0aa577d1a0fa05407542f2676ac5a88a27ac2c3a 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
@@ -1,47 +1,61 @@
-"pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","tx_irretutorial_hotels","l10n_state",,
-,1,0,256,0,0,0,0,0,0,0,0,0,"FunctionalTest",0,,,
-,88,1,256,0,0,0,0,0,0,0,0,0,"DataHandlerTest",0,,,
-,89,88,256,0,0,0,0,0,0,0,0,0,"Relations",2,,,
-,90,88,512,0,0,0,0,0,0,0,0,0,"Target",0,,,
-,91,88,256,0,1,89,0,0,0,0,0,0,"[Translate to Dansk:] Relations",2,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_irretutorial_hotels"":""parent""}",,
-"tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1nff_hotels",,,
-,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
-,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier","offers"
-,2,89,1,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,1026,0,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,0,"Hotel #1",298,"tt_content",,1
-,6,89,1,0,1,2,2,0,0,0,0,0,"[Translate to Dansk:] Hotel #0",91,"pages",,0
-,7,89,2,0,0,0,0,0,0,0,0,0,"Hotel #007",89,"pages",,0
-,8,89,2,0,1,7,0,0,0,0,0,0,"[Translate to Dansk:] Hotel #007",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","t3ver_move_id","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
-,6,89,2,0,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
-"sys_refindex",,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,
-,"487e5b17e1948485a88f9a2d2f161cdf","tx_irretutorial_1nff_hotel",6,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"5f12a830d447ebd01de57dea5b6c24b6","tx_irretutorial_1nff_hotel",6,"l18n_parent",0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"821e210a4b42d0bd2605f5ab998cbe65","pages",91,"tx_irretutorial_hotels",0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,
-,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,,,
-,"36477ae527b8a8ddd6f3a4f59d61b4b4","tx_irretutorial_1nff_hotel",8,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"af375c778117c206674c84b69850dcb5","pages",89,"tx_irretutorial_hotels",1,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,,,
-,"cd6205659b16fe05d5adf2df0fdf0842","pages",91,"tx_irretutorial_hotels",1,0,0,"tx_irretutorial_1nff_hotel",8,,,,,,,,
-,"86f2aa617f20f99cbe04d2c8913efe75","tx_irretutorial_1nff_hotel",8,"l18n_parent",0,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,,,
+"pages",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","tx_irretutorial_hotels","l10n_state",,,,,,,,,,,,,
+,1,0,256,0,0,0,0,0,0,0,0,0,"FunctionalTest",0,,,,,,,,,,,,,,
+,88,1,256,0,0,0,0,0,0,0,0,0,"DataHandlerTest",0,,,,,,,,,,,,,,
+,89,88,256,0,0,0,0,0,0,0,0,0,"Relations",2,,,,,,,,,,,,,,
+,90,88,512,0,0,0,0,0,0,0,0,0,"Target",0,,,,,,,,,,,,,,
+,91,88,256,0,1,89,0,0,0,0,0,0,"[Translate to Dansk:] Relations",2,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_irretutorial_hotels"":""parent""}",,,,,,,,,,,,,
+"tt_content",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1nff_hotels",,,,,,,,,,,,,,
+,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,,,,,,,
+,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,,,,,,,,,,
+"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier","offers",,,,,,,,,,,
+,2,89,1,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,1026,0,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,0,"Hotel #1",298,"tt_content",,1,,,,,,,,,,,
+,6,89,1,0,1,2,2,0,0,0,0,0,"[Translate to Dansk:] Hotel #0",91,"pages",,0,,,,,,,,,,,
+,7,89,2,0,0,0,0,0,0,0,0,0,"Hotel #007",89,"pages",,0,,,,,,,,,,,
+,8,89,2,0,1,7,0,0,0,0,0,0,"[Translate to Dansk:] Hotel #007",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","t3ver_move_id","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,,,,,,,,,,,
+,6,89,2,0,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,,,,,,,,,,
+,7,89,1,0,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,,,,,,,,,,
+,8,89,1,0,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,,,,,,,,,,
+"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier",,,,,,,,,,,,
+,7,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,8,89,2,0,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,9,89,3,0,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,10,89,1,0,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,11,89,2,0,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,12,89,1,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+"sys_refindex",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,,,,,,,,,,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,,,,,,,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,,,,,,,,,,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,,,,,,,,,,,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,,,,,,,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,,,,,,,,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,,,,,,,,,,,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,,,,,,,,,,,,,,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,,,,,,,,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,,,,,,,,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,,,,,,,,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,,,,,,,,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,,,,,,,,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,,,,,,,,,,,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,,,,,,,,,,,,,,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,,,,,,,,,,,,
+,"487e5b17e1948485a88f9a2d2f161cdf","tx_irretutorial_1nff_hotel",6,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,,,,,,,,,,,
+,"5f12a830d447ebd01de57dea5b6c24b6","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,,,,,,,,,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,,,,,,,,,,,,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,,,,,,,,,,,
+,"821e210a4b42d0bd2605f5ab998cbe65","pages",91,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,,,,,,,,,
+,"af375c778117c206674c84b69850dcb5","pages",89,"tx_irretutorial_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,,,,,,,,,,,
+,"cd6205659b16fe05d5adf2df0fdf0842","pages",91,"tx_irretutorial_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",8,,,,,,,,,,,,,,,,
+,"36477ae527b8a8ddd6f3a4f59d61b4b4","tx_irretutorial_1nff_hotel",8,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,,,,,,,,,,,
+,"86f2aa617f20f99cbe04d2c8913efe75","tx_irretutorial_1nff_hotel",8,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,,,,,,,,,,,
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 55f7a04c13c2e6e51832d68e168393cfa60cf905..4f38b46c7a965ef5251601080454117ff6d8bcbf 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
@@ -1,43 +1,57 @@
-"pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","tx_irretutorial_hotels","l10n_state",,
-,1,0,256,0,0,0,0,0,0,0,0,0,"FunctionalTest",0,,,
-,88,1,256,0,0,0,0,0,0,0,0,0,"DataHandlerTest",0,,,
-,89,88,256,0,0,0,0,0,0,0,0,0,"Relations",2,,,
-,90,88,512,0,0,0,0,0,0,0,0,0,"Target",0,,,
-,91,88,256,0,1,89,0,0,0,0,0,0,"[Translate to Dansk:] Relations",2,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_irretutorial_hotels"":""parent""}",,
-"tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1nff_hotels",,,
-,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
-,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier","offers"
-,2,89,1,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,1026,0,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,0,"Hotel #1",298,"tt_content",,1
-,6,89,1,0,0,0,2,0,0,0,0,0,"Hotel #0",91,"pages",,0
-,7,89,2,0,0,0,0,0,0,0,0,0,"Hotel #007",89,"pages",,0
-,8,89,2,0,0,0,0,0,0,0,0,0,"Hotel #007",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","t3ver_move_id","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
-,6,89,2,0,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
-"sys_refindex",,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"821e210a4b42d0bd2605f5ab998cbe65","pages",91,"tx_irretutorial_hotels",0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,
-,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,,,
-,"af375c778117c206674c84b69850dcb5","pages",89,"tx_irretutorial_hotels",1,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,,,
-,"cd6205659b16fe05d5adf2df0fdf0842","pages",91,"tx_irretutorial_hotels",1,0,0,"tx_irretutorial_1nff_hotel",8,,,,,,,,
+"pages",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","tx_irretutorial_hotels","l10n_state",,,,,,,,,,,,,
+,1,0,256,0,0,0,0,0,0,0,0,0,"FunctionalTest",0,,,,,,,,,,,,,,
+,88,1,256,0,0,0,0,0,0,0,0,0,"DataHandlerTest",0,,,,,,,,,,,,,,
+,89,88,256,0,0,0,0,0,0,0,0,0,"Relations",2,,,,,,,,,,,,,,
+,90,88,512,0,0,0,0,0,0,0,0,0,"Target",0,,,,,,,,,,,,,,
+,91,88,256,0,1,89,0,0,0,0,0,0,"[Translate to Dansk:] Relations",2,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_irretutorial_hotels"":""parent""}",,,,,,,,,,,,,
+"tt_content",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1nff_hotels",,,,,,,,,,,,,,
+,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,,,,,,,
+,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,,,,,,,,,,
+"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier","offers",,,,,,,,,,,
+,2,89,1,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,1026,0,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,0,"Hotel #1",298,"tt_content",,1,,,,,,,,,,,
+,6,89,1,0,0,0,2,0,0,0,0,0,"Hotel #0",91,"pages",,0,,,,,,,,,,,
+,7,89,2,0,0,0,0,0,0,0,0,0,"Hotel #007",89,"pages",,0,,,,,,,,,,,
+,8,89,2,0,0,0,0,0,0,0,0,0,"Hotel #007",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","t3ver_move_id","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,,,,,,,,,,,
+,6,89,2,0,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,,,,,,,,,,
+,7,89,1,0,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,,,,,,,,,,
+,8,89,1,0,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,,,,,,,,,,
+"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier",,,,,,,,,,,,
+,7,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,8,89,2,0,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,9,89,3,0,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,10,89,1,0,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,11,89,2,0,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,12,89,1,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+"sys_refindex",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,,,,,,,,,,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,,,,,,,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,,,,,,,,,,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,,,,,,,,,,,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,,,,,,,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,,,,,,,,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,,,,,,,,,,,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,,,,,,,,,,,,,,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,,,,,,,,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,,,,,,,,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,,,,,,,,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,,,,,,,,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,,,,,,,,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,,,,,,,,,,,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,,,,,,,,,,,,,,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,,,,,,,,,,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,,,,,,,,,,,,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,,,,,,,,,,,
+,"821e210a4b42d0bd2605f5ab998cbe65","pages",91,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,,,,,,,,,
+,"af375c778117c206674c84b69850dcb5","pages",89,"tx_irretutorial_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,,,,,,,,,,,
+,"cd6205659b16fe05d5adf2df0fdf0842","pages",91,"tx_irretutorial_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",8,,,,,,,,,,,,,,,,
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 1cda275345e925faf3b3f3b690f763f618d2c435..0ee27831a85cbf3ac1ce7ab6af536a4c03ae5990 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
@@ -34,14 +34,29 @@
,12,89,1,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
"sys_refindex",,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"487e5b17e1948485a88f9a2d2f161cdf","tx_irretutorial_1nff_hotel",6,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"5f12a830d447ebd01de57dea5b6c24b6","tx_irretutorial_1nff_hotel",6,"l18n_parent",0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,,,
-,"821e210a4b42d0bd2605f5ab998cbe65","pages",91,"tx_irretutorial_hotels",0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,
-,"595e5e033f510dde7c921d3381b382c4","pages",92,"l10n_parent",0,0,0,"pages",89,,,,,,,,
-,"d9b676030a71bcc2e059eb713ec3aac0","pages",92,"sys_language_uid",0,0,0,"sys_language",2,,,,,,,,
-,"ba7bc372f88d5341e16de886d61b513c","tx_irretutorial_1nff_hotel",7,"sys_language_uid",0,0,0,"sys_language",2,,,,,,,,
-,"3db926c3b3fab41c0a80d512b0accc94","tx_irretutorial_1nff_hotel",7,"l18n_parent",0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,,,
-,"cf379014ad3a47e1889071270ae13b74","pages",92,"tx_irretutorial_hotels",0,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,,,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,,,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,
+,"487e5b17e1948485a88f9a2d2f161cdf","tx_irretutorial_1nff_hotel",6,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,
+,"5f12a830d447ebd01de57dea5b6c24b6","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,
+,"821e210a4b42d0bd2605f5ab998cbe65","pages",91,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
+,"ba7bc372f88d5341e16de886d61b513c","tx_irretutorial_1nff_hotel",7,"sys_language_uid",,,,0,0,0,"sys_language",2,,,,,
+,"3db926c3b3fab41c0a80d512b0accc94","tx_irretutorial_1nff_hotel",7,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
+,"595e5e033f510dde7c921d3381b382c4","pages",92,"l10n_parent",,,,0,0,0,"pages",89,,,,,
+,"d9b676030a71bcc2e059eb713ec3aac0","pages",92,"sys_language_uid",,,,0,0,0,"sys_language",2,,,,,
+,"cf379014ad3a47e1889071270ae13b74","pages",92,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",7,,,,,
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 0b916af21ded9a70748967b3e08be68c75acf235..f2b69fbf030ffa4ef788b15f45af4494ec555783 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
@@ -32,9 +32,24 @@
,12,89,1,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
"sys_refindex",,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"487e5b17e1948485a88f9a2d2f161cdf","tx_irretutorial_1nff_hotel",6,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"5f12a830d447ebd01de57dea5b6c24b6","tx_irretutorial_1nff_hotel",6,"l18n_parent",0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,,,
-,"821e210a4b42d0bd2605f5ab998cbe65","pages",91,"tx_irretutorial_hotels",0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,,,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,,,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,
+,"487e5b17e1948485a88f9a2d2f161cdf","tx_irretutorial_1nff_hotel",6,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,
+,"5f12a830d447ebd01de57dea5b6c24b6","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,
+,"821e210a4b42d0bd2605f5ab998cbe65","pages",91,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
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 1f2e0af20e9ed02d1cf6aca201e54c0785bdae60..8d9a8d0a473914154e59a154c3275db4de628530 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
@@ -1,40 +1,55 @@
-"pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","tx_irretutorial_hotels","l10n_state",,
-,1,0,256,0,0,0,0,0,0,0,0,0,"FunctionalTest",0,,,
-,88,1,256,0,0,0,0,0,0,0,0,0,"DataHandlerTest",0,,,
-,89,88,256,0,0,0,0,0,0,0,0,0,"Relations",1,,,
-,90,88,512,0,0,0,0,0,0,0,0,0,"Target",0,,,
-,91,88,256,0,1,89,0,0,0,0,0,0,"[Translate to Dansk:] Relations",1,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_irretutorial_hotels"":""parent""}",,
-"tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1nff_hotels",,,
-,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
-,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier","offers"
-,2,89,1,0,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,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,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,2,2,0,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","t3ver_move_id","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
-,6,89,2,0,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
-"sys_refindex",,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,
-,"487e5b17e1948485a88f9a2d2f161cdf","tx_irretutorial_1nff_hotel",6,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"5f12a830d447ebd01de57dea5b6c24b6","tx_irretutorial_1nff_hotel",6,"l18n_parent",0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"821e210a4b42d0bd2605f5ab998cbe65","pages",91,"tx_irretutorial_hotels",0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,
+"pages",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","tx_irretutorial_hotels","l10n_state",,,,,,,,,,,,,
+,1,0,256,0,0,0,0,0,0,0,0,0,"FunctionalTest",0,,,,,,,,,,,,,,
+,88,1,256,0,0,0,0,0,0,0,0,0,"DataHandlerTest",0,,,,,,,,,,,,,,
+,89,88,256,0,0,0,0,0,0,0,0,0,"Relations",1,,,,,,,,,,,,,,
+,90,88,512,0,0,0,0,0,0,0,0,0,"Target",0,,,,,,,,,,,,,,
+,91,88,256,0,1,89,0,0,0,0,0,0,"[Translate to Dansk:] Relations",1,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_irretutorial_hotels"":""parent""}",,,,,,,,,,,,,
+"tt_content",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1nff_hotels",,,,,,,,,,,,,,
+,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,,,,,,,
+,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,,,,,,,,,,
+"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier","offers",,,,,,,,,,,
+,2,89,1,0,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,,,,,,,,,,
+,3,89,1,0,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,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,2,2,0,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","t3ver_move_id","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,,,,,,,,,,,
+,6,89,2,0,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,,,,,,,,,,
+,7,89,1,0,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,,,,,,,,,,
+,8,89,1,0,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,,,,,,,,,,
+"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier",,,,,,,,,,,,
+,7,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,8,89,2,0,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,9,89,3,0,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,10,89,1,0,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,11,89,2,0,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,12,89,1,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+"sys_refindex",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,,,,,,,,,,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,,,,,,,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,,,,,,,,,,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,,,,,,,,,,,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,,,,,,,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,,,,,,,,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,,,,,,,,,,,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,,,,,,,,,,,,,,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,,,,,,,,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,,,,,,,,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,,,,,,,,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,,,,,,,,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,,,,,,,,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,,,,,,,,,,,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,,,,,,,,,,,,,,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,,,,,,,,,,,,
+,"487e5b17e1948485a88f9a2d2f161cdf","tx_irretutorial_1nff_hotel",6,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,,,,,,,,,,,
+,"5f12a830d447ebd01de57dea5b6c24b6","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,,,,,,,,,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,,,,,,,,,,,,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,,,,,,,,,,,
+,"821e210a4b42d0bd2605f5ab998cbe65","pages",91,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,,,,,,,,,
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 9709d324936ccf4570bb3b515c26e20f07b977c5..7aacc7a467998557f824155b931d52bd03a34912 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
@@ -1,24 +1,39 @@
-"pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","tx_irretutorial_hotels","l10n_state",,
-,1,0,256,0,0,0,0,0,0,0,0,0,"FunctionalTest",0,,,
-,88,1,256,0,0,0,0,0,0,0,0,0,"DataHandlerTest",0,,,
-,89,88,256,0,0,0,0,0,0,0,0,0,"Relations",1,,,
-,90,88,512,0,0,0,0,0,0,0,0,0,"Target",0,,,
-,91,88,256,0,1,89,0,0,0,0,0,0,"[Translate to Dansk:] Relations",2,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_irretutorial_hotels"":""custom""}",,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier","offers"
-,2,89,1,0,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,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,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,2,2,0,0,0,0,0,"[Translate to Dansk:] Hotel #0",91,"pages",,0
-,7,89,2,0,1,0,0,0,0,0,0,0,"Hotel in dansk page only",91,"pages",,0
-"sys_refindex",,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,
-,"487e5b17e1948485a88f9a2d2f161cdf","tx_irretutorial_1nff_hotel",6,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"5f12a830d447ebd01de57dea5b6c24b6","tx_irretutorial_1nff_hotel",6,"l18n_parent",0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"821e210a4b42d0bd2605f5ab998cbe65","pages",91,"tx_irretutorial_hotels",0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,
-,"6b28c82d72798c1ac145b0ef02c311ee","tx_irretutorial_1nff_hotel",7,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"b2cef85550f8066ce1a9fa224dd74a5a","pages",91,"tx_irretutorial_hotels",1,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,,,
+"pages",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","tx_irretutorial_hotels","l10n_state",,,,,,,,,,,,,
+,1,0,256,0,0,0,0,0,0,0,0,0,"FunctionalTest",0,,,,,,,,,,,,,,
+,88,1,256,0,0,0,0,0,0,0,0,0,"DataHandlerTest",0,,,,,,,,,,,,,,
+,89,88,256,0,0,0,0,0,0,0,0,0,"Relations",1,,,,,,,,,,,,,,
+,90,88,512,0,0,0,0,0,0,0,0,0,"Target",0,,,,,,,,,,,,,,
+,91,88,256,0,1,89,0,0,0,0,0,0,"[Translate to Dansk:] Relations",2,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_irretutorial_hotels"":""custom""}",,,,,,,,,,,,,
+"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier","offers",,,,,,,,,,,
+,2,89,1,0,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,,,,,,,,,,
+,3,89,1,0,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,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,2,2,0,0,0,0,0,"[Translate to Dansk:] Hotel #0",91,"pages",,0,,,,,,,,,,,
+,7,89,2,0,1,0,0,0,0,0,0,0,"Hotel in dansk page only",91,"pages",,0,,,,,,,,,,,
+"sys_refindex",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,,,,,,,,,,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,,,,,,,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,,,,,,,,,,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,,,,,,,,,,,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,,,,,,,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,,,,,,,,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,,,,,,,,,,,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,,,,,,,,,,,,,,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,,,,,,,,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,,,,,,,,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,,,,,,,,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,,,,,,,,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,,,,,,,,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,,,,,,,,,,,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,,,,,,,,,,,,,,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,,,,,,,,,,,,
+,"487e5b17e1948485a88f9a2d2f161cdf","tx_irretutorial_1nff_hotel",6,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,,,,,,,,,,,
+,"5f12a830d447ebd01de57dea5b6c24b6","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,,,,,,,,,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,,,,,,,,,,,,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,,,,,,,,,,,
+,"821e210a4b42d0bd2605f5ab998cbe65","pages",91,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,,,,,,,,,
+,"b2cef85550f8066ce1a9fa224dd74a5a","pages",91,"tx_irretutorial_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,,,,,,,,,,,
+,"6b28c82d72798c1ac145b0ef02c311ee","tx_irretutorial_1nff_hotel",7,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,,,,,,,,,,,
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 2663bd447718e8f1f9322483e3ca5ffce037de85..124807cd18d241434abe547049be749d424c6288 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
@@ -35,37 +35,50 @@
,14,89,1,0,1,13,13,0,0,0,0,0,"[Translate to Dansk:] Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
,15,89,1,0,2,13,14,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Price #1.1.1",10,"tx_irretutorial_1nff_offer",,
"sys_refindex",,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"595e5e033f510dde7c921d3381b382c4","pages",92,"l10n_parent",0,0,0,"pages",89,,,,,,,,
-,"d9b676030a71bcc2e059eb713ec3aac0","pages",92,"sys_language_uid",0,0,0,"sys_language",2,,,,,,,,
-,"46b6914e86268da4acdd7ccbf281bc91","tx_irretutorial_1nff_price",14,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"cd7b32a4f3156c3004f525b832707a67","tx_irretutorial_1nff_price",14,"l18n_parent",0,0,0,"tx_irretutorial_1nff_price",13,,,,,,,,
-,"452f53179e104b4875a006167e37c204","tx_irretutorial_1nff_offer",9,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"cabb549966fd676b09f3852a6d219d79","tx_irretutorial_1nff_offer",9,"l18n_parent",0,0,0,"tx_irretutorial_1nff_offer",8,,,,,,,,
-,"79cc995658ae92af7fa70085b8758270","tx_irretutorial_1nff_offer",9,"prices",0,0,0,"tx_irretutorial_1nff_price",14,,,,,,,,
-,"487e5b17e1948485a88f9a2d2f161cdf","tx_irretutorial_1nff_hotel",6,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"bafd9ee28da568646fe7c1dea137142b","tx_irretutorial_1nff_hotel",6,"l18n_parent",0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,,,
-,"a0cfe1ce39be83687c92da2f4bd64df7","tx_irretutorial_1nff_hotel",6,"offers",0,0,0,"tx_irretutorial_1nff_offer",9,,,,,,,,
-,"aa9d44bd50d47873e29c5a4987bda6e0","tt_content",299,"l18n_parent",0,0,0,"tt_content",298,,,,,,,,
-,"8d75f94b9d17c650dc9bfa6a3f84e254","tt_content",299,"tx_irretutorial_1nff_hotels",0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,
-,"0b536ea2c4b1d992a65bcc2084381c10","tx_irretutorial_1nff_price",15,"sys_language_uid",0,0,0,"sys_language",2,,,,,,,,
-,"e7e11fc4f1d743c9b0bfe6fa85517336","tx_irretutorial_1nff_price",15,"l18n_parent",0,0,0,"tx_irretutorial_1nff_price",13,,,,,,,,
-,"089dd5466d6332cce794084e0ad9549b","tx_irretutorial_1nff_offer",10,"sys_language_uid",0,0,0,"sys_language",2,,,,,,,,
-,"6678c7c9eea1168d8b3b04099251b539","tx_irretutorial_1nff_offer",10,"l18n_parent",0,0,0,"tx_irretutorial_1nff_offer",8,,,,,,,,
-,"832e8f4e4020734e194fc9f4a3e1ba6a","tx_irretutorial_1nff_offer",10,"prices",0,0,0,"tx_irretutorial_1nff_price",15,,,,,,,,
-,"ba7bc372f88d5341e16de886d61b513c","tx_irretutorial_1nff_hotel",7,"sys_language_uid",0,0,0,"sys_language",2,,,,,,,,
-,"bb8ef5d29796ed3f736ede6d1c3e6a9d","tx_irretutorial_1nff_hotel",7,"l18n_parent",0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,,,
-,"edc6312799bb1d392a4eb4d9d437d56e","tx_irretutorial_1nff_hotel",7,"offers",0,0,0,"tx_irretutorial_1nff_offer",10,,,,,,,,
-,"ff5b07a6c39d986fcf41e56dacc4e181","tt_content",300,"l18n_parent",0,0,0,"tt_content",298,,,,,,,,
-,"8e6a63d82781c428ec4fedaf606f294f","tt_content",300,"tx_irretutorial_1nff_hotels",0,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,,,
-,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,,,
-,"4681fad40e203ca5236e4cb7e4a4afc1","tx_irretutorial_1nff_hotel",9,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"390d3e88cff5d7b9e7f151ee0fe1b8ae","tx_irretutorial_1nff_hotel",10,"sys_language_uid",0,0,0,"sys_language",2,,,,,,,,
-,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",0,0,0,"tx_irretutorial_1nff_offer",8,,,,,,,,
-,"51547367bbb0a71c27f63bf3f188e09f","tt_content",298,"tx_irretutorial_1nff_hotels",1,0,0,"tx_irretutorial_1nff_hotel",8,,,,,,,,
-,"109da7cb3b779eef23f6b1b58d6dd994","tt_content",299,"tx_irretutorial_1nff_hotels",1,0,0,"tx_irretutorial_1nff_hotel",9,,,,,,,,
-,"b8af4f5d9ebf75c6b94411455c618729","tt_content",300,"tx_irretutorial_1nff_hotels",1,0,0,"tx_irretutorial_1nff_hotel",10,,,,,,,,
-,"557f7a4396210007735548e1edc270d7","tx_irretutorial_1nff_hotel",9,"l18n_parent",0,0,0,"tx_irretutorial_1nff_hotel",8,,,,,,,,
-,"160c6fe73d13b33652bb8be42d051a33","tx_irretutorial_1nff_hotel",10,"l18n_parent",0,0,0,"tx_irretutorial_1nff_hotel",8,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,,,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,,,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,
+,"595e5e033f510dde7c921d3381b382c4","pages",92,"l10n_parent",,,,0,0,0,"pages",89,,,,,
+,"d9b676030a71bcc2e059eb713ec3aac0","pages",92,"sys_language_uid",,,,0,0,0,"sys_language",2,,,,,
+,"46b6914e86268da4acdd7ccbf281bc91","tx_irretutorial_1nff_price",14,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,
+,"cd7b32a4f3156c3004f525b832707a67","tx_irretutorial_1nff_price",14,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,
+,"452f53179e104b4875a006167e37c204","tx_irretutorial_1nff_offer",9,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,
+,"cabb549966fd676b09f3852a6d219d79","tx_irretutorial_1nff_offer",9,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,
+,"79cc995658ae92af7fa70085b8758270","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",14,,,,,
+,"487e5b17e1948485a88f9a2d2f161cdf","tx_irretutorial_1nff_hotel",6,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,
+,"bafd9ee28da568646fe7c1dea137142b","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
+,"a0cfe1ce39be83687c92da2f4bd64df7","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",9,,,,,
+,"aa9d44bd50d47873e29c5a4987bda6e0","tt_content",299,"l18n_parent",,,,0,0,0,"tt_content",298,,,,,
+,"8d75f94b9d17c650dc9bfa6a3f84e254","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
+,"0b536ea2c4b1d992a65bcc2084381c10","tx_irretutorial_1nff_price",15,"sys_language_uid",,,,0,0,0,"sys_language",2,,,,,
+,"e7e11fc4f1d743c9b0bfe6fa85517336","tx_irretutorial_1nff_price",15,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,
+,"089dd5466d6332cce794084e0ad9549b","tx_irretutorial_1nff_offer",10,"sys_language_uid",,,,0,0,0,"sys_language",2,,,,,
+,"6678c7c9eea1168d8b3b04099251b539","tx_irretutorial_1nff_offer",10,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,
+,"832e8f4e4020734e194fc9f4a3e1ba6a","tx_irretutorial_1nff_offer",10,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",15,,,,,
+,"ba7bc372f88d5341e16de886d61b513c","tx_irretutorial_1nff_hotel",7,"sys_language_uid",,,,0,0,0,"sys_language",2,,,,,
+,"bb8ef5d29796ed3f736ede6d1c3e6a9d","tx_irretutorial_1nff_hotel",7,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
+,"edc6312799bb1d392a4eb4d9d437d56e","tx_irretutorial_1nff_hotel",7,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",10,,,,,
+,"ff5b07a6c39d986fcf41e56dacc4e181","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",298,,,,,
+,"8e6a63d82781c428ec4fedaf606f294f","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",7,,,,,
+,"51547367bbb0a71c27f63bf3f188e09f","tt_content",298,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",8,,,,,
+,"109da7cb3b779eef23f6b1b58d6dd994","tt_content",299,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",9,,,,,
+,"b8af4f5d9ebf75c6b94411455c618729","tt_content",300,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",10,,,,,
+,"4681fad40e203ca5236e4cb7e4a4afc1","tx_irretutorial_1nff_hotel",9,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,
+,"557f7a4396210007735548e1edc270d7","tx_irretutorial_1nff_hotel",9,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_hotel",8,,,,,
+,"390d3e88cff5d7b9e7f151ee0fe1b8ae","tx_irretutorial_1nff_hotel",10,"sys_language_uid",,,,0,0,0,"sys_language",2,,,,,
+,"160c6fe73d13b33652bb8be42d051a33","tx_irretutorial_1nff_hotel",10,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_hotel",8,,,,,
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 0c4dcaab7b3336306239525b65b4da8e35bf2257..d96cdc135c727b89816de2ce7aeca8af9e8e40df 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
@@ -1,63 +1,76 @@
"tt_content",,,,,,,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1nff_hotels","l10n_state",,,
-,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,\NULL,,,
-,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",2,\NULL,,,
+,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,"\NULL",,,
+,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",2,"\NULL",,,
,299,89,768,0,1,298,298,0,0,0,0,0,"[Translate to Dansk:] Regular Element #2",2,"{""tx_irretutorial_1nff_hotels"":""parent""}",,,
"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier","offers","l10n_state"
-,2,89,513,0,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,0,"Hotel #1",297,"tt_content",,2,\NULL
-,4,89,1026,0,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,0,"Hotel #1",298,"tt_content",,1,\NULL
+,2,89,513,0,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,0,"Hotel #1",297,"tt_content",,2,"\NULL"
+,4,89,1026,0,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,0,"Hotel #1",298,"tt_content",,1,"\NULL"
,6,89,1,0,1,5,5,0,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,0,"New Hotel #1",298,"tt_content",,1,\NULL
+,7,89,2,0,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,0,"[Translate to Dansk:] New Hotel #1",299,"tt_content",,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","t3ver_move_id","title","parentid","parenttable","parentidentifier","prices","l10n_state"
-,5,89,513,0,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,\NULL
-,6,89,1026,0,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,\NULL
-,7,89,513,0,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,\NULL
-,8,89,513,0,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,\NULL
+,5,89,513,0,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,"\NULL"
+,6,89,1026,0,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,"\NULL"
+,7,89,513,0,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,"\NULL"
+,8,89,513,0,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,"\NULL"
,9,89,513,0,1,8,8,0,0,0,0,0,"[Translate to Dansk:] Offer #1.1",6,"tx_irretutorial_1nff_hotel",,1,"{""prices"":""parent""}"
-,10,89,1,0,0,0,0,0,0,0,0,0,"New Offer #1.1",7,"tx_irretutorial_1nff_hotel",,1,\NULL
+,10,89,1,0,0,0,0,0,0,0,0,0,"New Offer #1.1",7,"tx_irretutorial_1nff_hotel",,1,"\NULL"
,11,89,1,0,1,10,0,0,0,0,0,0,"[Translate to Dansk:] New Offer #1.1",8,"tx_irretutorial_1nff_hotel",,1,"{""prices"":""parent""}"
"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier","l10n_state",
-,7,89,513,0,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,\NULL,
-,8,89,1026,0,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,\NULL,
-,9,89,1027,0,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,\NULL,
-,10,89,513,0,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,\NULL,
-,11,89,1026,0,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,\NULL,
-,12,89,513,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,\NULL,
-,13,89,513,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,\NULL,
-,14,89,513,0,1,13,13,0,0,0,0,0,"[Translate to Dansk:] Price #1.1.1",9,"tx_irretutorial_1nff_offer",,\NULL,
-,15,89,1,0,0,0,0,0,0,0,0,0,"New Price #1.1.1",10,"tx_irretutorial_1nff_offer",,\NULL,
-,16,89,1,0,1,15,0,0,0,0,0,0,"[Translate to Dansk:] New Price #1.1.1",11,"tx_irretutorial_1nff_offer",,\NULL,
+,7,89,513,0,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,"\NULL",
+,8,89,1026,0,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,"\NULL",
+,9,89,1027,0,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,"\NULL",
+,10,89,513,0,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,"\NULL",
+,11,89,1026,0,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,"\NULL",
+,12,89,513,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,"\NULL",
+,13,89,513,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,"\NULL",
+,14,89,513,0,1,13,13,0,0,0,0,0,"[Translate to Dansk:] Price #1.1.1",9,"tx_irretutorial_1nff_offer",,"\NULL",
+,15,89,1,0,0,0,0,0,0,0,0,0,"New Price #1.1.1",10,"tx_irretutorial_1nff_offer",,"\NULL",
+,16,89,1,0,1,15,0,0,0,0,0,0,"[Translate to Dansk:] New Price #1.1.1",11,"tx_irretutorial_1nff_offer",,"\NULL",
"sys_refindex",,,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,,
-,"46b6914e86268da4acdd7ccbf281bc91","tx_irretutorial_1nff_price",14,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,,
-,"cd7b32a4f3156c3004f525b832707a67","tx_irretutorial_1nff_price",14,"l18n_parent",0,0,0,"tx_irretutorial_1nff_price",13,,,,,,,,,
-,"452f53179e104b4875a006167e37c204","tx_irretutorial_1nff_offer",9,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,,
-,"cabb549966fd676b09f3852a6d219d79","tx_irretutorial_1nff_offer",9,"l18n_parent",0,0,0,"tx_irretutorial_1nff_offer",8,,,,,,,,,
-,"79cc995658ae92af7fa70085b8758270","tx_irretutorial_1nff_offer",9,"prices",0,0,0,"tx_irretutorial_1nff_price",14,,,,,,,,,
-,"487e5b17e1948485a88f9a2d2f161cdf","tx_irretutorial_1nff_hotel",6,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,,
-,"bafd9ee28da568646fe7c1dea137142b","tx_irretutorial_1nff_hotel",6,"l18n_parent",0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,,,,
-,"a0cfe1ce39be83687c92da2f4bd64df7","tx_irretutorial_1nff_hotel",6,"offers",0,0,0,"tx_irretutorial_1nff_offer",9,,,,,,,,,
-,"aa9d44bd50d47873e29c5a4987bda6e0","tt_content",299,"l18n_parent",0,0,0,"tt_content",298,,,,,,,,,
-,"8d75f94b9d17c650dc9bfa6a3f84e254","tt_content",299,"tx_irretutorial_1nff_hotels",0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,,
-,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,,,,
-,"36477ae527b8a8ddd6f3a4f59d61b4b4","tx_irretutorial_1nff_hotel",8,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,,
-,"a94b6c0759ee650e37fff9bd515a2940","tx_irretutorial_1nff_offer",11,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,,
-,"4df6f709a7aeb2f19ccd43dfb0d4de84","tx_irretutorial_1nff_price",16,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,,
-,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",0,0,0,"tx_irretutorial_1nff_offer",8,,,,,,,,,
-,"039a3027510a31d4182708b4c446d9d9","tt_content",298,"tx_irretutorial_1nff_hotels",1,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,,,,
-,"c3e2baa5772151a41d2956921124c63a","tt_content",299,"tx_irretutorial_1nff_hotels",1,0,0,"tx_irretutorial_1nff_hotel",8,,,,,,,,,
-,"edc6312799bb1d392a4eb4d9d437d56e","tx_irretutorial_1nff_hotel",7,"offers",0,0,0,"tx_irretutorial_1nff_offer",10,,,,,,,,,
-,"86f2aa617f20f99cbe04d2c8913efe75","tx_irretutorial_1nff_hotel",8,"l18n_parent",0,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,,,,
-,"e4c917a9b9d8a1ade11fb247f82e7b8c","tx_irretutorial_1nff_hotel",8,"offers",0,0,0,"tx_irretutorial_1nff_offer",11,,,,,,,,,
-,"832e8f4e4020734e194fc9f4a3e1ba6a","tx_irretutorial_1nff_offer",10,"prices",0,0,0,"tx_irretutorial_1nff_price",15,,,,,,,,,
-,"02aefc83454d45c58b6e06a5a8fe8300","tx_irretutorial_1nff_offer",11,"l18n_parent",0,0,0,"tx_irretutorial_1nff_offer",10,,,,,,,,,
-,"0b1f257e028422a03a7754f9af22e894","tx_irretutorial_1nff_offer",11,"prices",0,0,0,"tx_irretutorial_1nff_price",16,,,,,,,,,
-,"d5b906003b64e0c4106389ffba26ae0c","tx_irretutorial_1nff_price",16,"l18n_parent",0,0,0,"tx_irretutorial_1nff_price",15,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,,,,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,
+,"46b6914e86268da4acdd7ccbf281bc91","tx_irretutorial_1nff_price",14,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,
+,"cd7b32a4f3156c3004f525b832707a67","tx_irretutorial_1nff_price",14,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,,
+,"452f53179e104b4875a006167e37c204","tx_irretutorial_1nff_offer",9,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,
+,"cabb549966fd676b09f3852a6d219d79","tx_irretutorial_1nff_offer",9,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
+,"79cc995658ae92af7fa70085b8758270","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",14,,,,,,
+,"487e5b17e1948485a88f9a2d2f161cdf","tx_irretutorial_1nff_hotel",6,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,
+,"bafd9ee28da568646fe7c1dea137142b","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
+,"a0cfe1ce39be83687c92da2f4bd64df7","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",9,,,,,,
+,"aa9d44bd50d47873e29c5a4987bda6e0","tt_content",299,"l18n_parent",,,,0,0,0,"tt_content",298,,,,,,
+,"8d75f94b9d17c650dc9bfa6a3f84e254","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,
+,"039a3027510a31d4182708b4c446d9d9","tt_content",298,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,
+,"c3e2baa5772151a41d2956921124c63a","tt_content",299,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",8,,,,,,
+,"edc6312799bb1d392a4eb4d9d437d56e","tx_irretutorial_1nff_hotel",7,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",10,,,,,,
+,"36477ae527b8a8ddd6f3a4f59d61b4b4","tx_irretutorial_1nff_hotel",8,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,
+,"86f2aa617f20f99cbe04d2c8913efe75","tx_irretutorial_1nff_hotel",8,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,
+,"e4c917a9b9d8a1ade11fb247f82e7b8c","tx_irretutorial_1nff_hotel",8,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",11,,,,,,
+,"832e8f4e4020734e194fc9f4a3e1ba6a","tx_irretutorial_1nff_offer",10,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",15,,,,,,
+,"a94b6c0759ee650e37fff9bd515a2940","tx_irretutorial_1nff_offer",11,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,
+,"02aefc83454d45c58b6e06a5a8fe8300","tx_irretutorial_1nff_offer",11,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_offer",10,,,,,,
+,"0b1f257e028422a03a7754f9af22e894","tx_irretutorial_1nff_offer",11,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",16,,,,,,
+,"4df6f709a7aeb2f19ccd43dfb0d4de84","tx_irretutorial_1nff_price",16,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,
+,"d5b906003b64e0c4106389ffba26ae0c","tx_irretutorial_1nff_price",16,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_price",15,,,,,,
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 9a4285a0c058e8f2fc53cc8eae1cdd3bd588032f..d8a4283f16ead396435462b6fc8f5ed21a2620a5 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
@@ -1,43 +1,58 @@
"tt_content",,,,,,,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","tx_irretutorial_1nff_hotels","l10n_state",,,
-,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,\NULL,,,
-,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",1,\NULL,,,
+,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,"\NULL",,,
+,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",1,"\NULL",,,
,299,89,768,0,1,298,298,0,0,0,0,0,"[Translate to Dansk:] Regular Element #2",1,"{""tx_irretutorial_1nff_hotels"":""parent""}",,,
"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier","offers","l10n_state"
-,2,89,1,0,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,0,"Hotel #1",297,"tt_content",,2,\NULL
-,4,89,514,0,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,0,"Hotel #1",298,"tt_content",,1,\NULL
+,2,89,1,0,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,0,"Hotel #1",297,"tt_content",,2,"\NULL"
+,4,89,514,0,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,0,"Hotel #1",298,"tt_content",,1,"\NULL"
,6,89,1,0,1,5,5,0,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",,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","t3ver_move_id","title","parentid","parenttable","parentidentifier","prices","l10n_state"
-,5,89,1,0,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,\NULL
-,6,89,514,0,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,\NULL
-,7,89,1,0,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,\NULL
-,8,89,1,0,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,\NULL
+,5,89,1,0,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,"\NULL"
+,6,89,514,0,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,"\NULL"
+,7,89,1,0,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,"\NULL"
+,8,89,1,0,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,"\NULL"
,9,89,1,0,1,8,8,0,0,0,0,0,"[Translate to Dansk:] Offer #1.1",6,"tx_irretutorial_1nff_hotel",,1,"{""prices"":""parent""}"
"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier","l10n_state",
-,7,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,\NULL,
-,8,89,514,0,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,\NULL,
-,9,89,515,0,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,\NULL,
-,10,89,1,0,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,\NULL,
-,11,89,514,0,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,\NULL,
-,12,89,1,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,\NULL,
-,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,\NULL,
-,14,89,1,0,1,13,13,0,0,0,0,0,"[Translate to Dansk:] Price #1.1.1",9,"tx_irretutorial_1nff_offer",,\NULL,
+,7,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,"\NULL",
+,8,89,514,0,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,"\NULL",
+,9,89,515,0,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,"\NULL",
+,10,89,1,0,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,"\NULL",
+,11,89,514,0,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,"\NULL",
+,12,89,1,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,"\NULL",
+,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,"\NULL",
+,14,89,1,0,1,13,13,0,0,0,0,0,"[Translate to Dansk:] Price #1.1.1",9,"tx_irretutorial_1nff_offer",,"\NULL",
"sys_refindex",,,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,,
-,"46b6914e86268da4acdd7ccbf281bc91","tx_irretutorial_1nff_price",14,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,,
-,"cd7b32a4f3156c3004f525b832707a67","tx_irretutorial_1nff_price",14,"l18n_parent",0,0,0,"tx_irretutorial_1nff_price",13,,,,,,,,,
-,"452f53179e104b4875a006167e37c204","tx_irretutorial_1nff_offer",9,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,,
-,"cabb549966fd676b09f3852a6d219d79","tx_irretutorial_1nff_offer",9,"l18n_parent",0,0,0,"tx_irretutorial_1nff_offer",8,,,,,,,,,
-,"79cc995658ae92af7fa70085b8758270","tx_irretutorial_1nff_offer",9,"prices",0,0,0,"tx_irretutorial_1nff_price",14,,,,,,,,,
-,"487e5b17e1948485a88f9a2d2f161cdf","tx_irretutorial_1nff_hotel",6,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,,
-,"bafd9ee28da568646fe7c1dea137142b","tx_irretutorial_1nff_hotel",6,"l18n_parent",0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,,,,
-,"a0cfe1ce39be83687c92da2f4bd64df7","tx_irretutorial_1nff_hotel",6,"offers",0,0,0,"tx_irretutorial_1nff_offer",9,,,,,,,,,
-,"aa9d44bd50d47873e29c5a4987bda6e0","tt_content",299,"l18n_parent",0,0,0,"tt_content",298,,,,,,,,,
-,"8d75f94b9d17c650dc9bfa6a3f84e254","tt_content",299,"tx_irretutorial_1nff_hotels",0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,,,,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,
+,"46b6914e86268da4acdd7ccbf281bc91","tx_irretutorial_1nff_price",14,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,
+,"cd7b32a4f3156c3004f525b832707a67","tx_irretutorial_1nff_price",14,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,,
+,"452f53179e104b4875a006167e37c204","tx_irretutorial_1nff_offer",9,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,
+,"cabb549966fd676b09f3852a6d219d79","tx_irretutorial_1nff_offer",9,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
+,"79cc995658ae92af7fa70085b8758270","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",14,,,,,,
+,"487e5b17e1948485a88f9a2d2f161cdf","tx_irretutorial_1nff_hotel",6,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,
+,"bafd9ee28da568646fe7c1dea137142b","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
+,"a0cfe1ce39be83687c92da2f4bd64df7","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",9,,,,,,
+,"aa9d44bd50d47873e29c5a4987bda6e0","tt_content",299,"l18n_parent",,,,0,0,0,"tt_content",298,,,,,,
+,"8d75f94b9d17c650dc9bfa6a3f84e254","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,
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 fcba47dca5a0ed8be9b5e4ad9b3b25b08c4f4ff9..7a29530457c6e414d8590fb124467d1f2f1e5874 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
@@ -28,16 +28,31 @@
,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
,14,89,1,0,1,13,13,0,0,0,0,0,"[Translate to Dansk:] Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
"sys_refindex",,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"46b6914e86268da4acdd7ccbf281bc91","tx_irretutorial_1nff_price",14,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"cd7b32a4f3156c3004f525b832707a67","tx_irretutorial_1nff_price",14,"l18n_parent",0,0,0,"tx_irretutorial_1nff_price",13,,,,,,,,
-,"452f53179e104b4875a006167e37c204","tx_irretutorial_1nff_offer",9,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"cabb549966fd676b09f3852a6d219d79","tx_irretutorial_1nff_offer",9,"l18n_parent",0,0,0,"tx_irretutorial_1nff_offer",8,,,,,,,,
-,"79cc995658ae92af7fa70085b8758270","tx_irretutorial_1nff_offer",9,"prices",0,0,0,"tx_irretutorial_1nff_price",14,,,,,,,,
-,"487e5b17e1948485a88f9a2d2f161cdf","tx_irretutorial_1nff_hotel",6,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,,
-,"bafd9ee28da568646fe7c1dea137142b","tx_irretutorial_1nff_hotel",6,"l18n_parent",0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,,,
-,"a0cfe1ce39be83687c92da2f4bd64df7","tx_irretutorial_1nff_hotel",6,"offers",0,0,0,"tx_irretutorial_1nff_offer",9,,,,,,,,
-,"aa9d44bd50d47873e29c5a4987bda6e0","tt_content",299,"l18n_parent",0,0,0,"tt_content",298,,,,,,,,
-,"8d75f94b9d17c650dc9bfa6a3f84e254","tt_content",299,"tx_irretutorial_1nff_hotels",0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,,,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,,,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,
+,"46b6914e86268da4acdd7ccbf281bc91","tx_irretutorial_1nff_price",14,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,
+,"cd7b32a4f3156c3004f525b832707a67","tx_irretutorial_1nff_price",14,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,
+,"452f53179e104b4875a006167e37c204","tx_irretutorial_1nff_offer",9,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,
+,"cabb549966fd676b09f3852a6d219d79","tx_irretutorial_1nff_offer",9,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,
+,"79cc995658ae92af7fa70085b8758270","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",14,,,,,
+,"487e5b17e1948485a88f9a2d2f161cdf","tx_irretutorial_1nff_hotel",6,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,
+,"bafd9ee28da568646fe7c1dea137142b","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
+,"a0cfe1ce39be83687c92da2f4bd64df7","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",9,,,,,
+,"aa9d44bd50d47873e29c5a4987bda6e0","tt_content",299,"l18n_parent",,,,0,0,0,"tt_content",298,,,,,
+,"8d75f94b9d17c650dc9bfa6a3f84e254","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
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 c807b078bea5497d404eb770d7038e88b52b2a0a..275af02f59f6009ad490192b97b6098d66a5cf08 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
@@ -24,5 +24,19 @@
,12,89,1,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
"sys_refindex",,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,
-,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",0,0,0,"tx_irretutorial_1nff_offer",7,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,,,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,,,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,
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 21c3959aa6a5f2726c77a6c3bd8e5e212e43a040..afc522d08d6ecba8524d86d7d8f177249a45e0dc 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
@@ -1,9 +1,23 @@
-"pages",,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","tx_irretutorial_hotels"
-,1,0,256,0,0,0,0,0,0,0,"FunctionalTest",0
-,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest",0
-,89,88,256,0,0,0,0,0,0,0,"Testing #1",1
-,90,88,512,0,0,0,0,0,0,0,"Target",0
-"sys_refindex",,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,
-,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",0,0,0,"tx_irretutorial_1nff_hotel",2,,,
+"pages",,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","tx_irretutorial_hotels",
+,1,0,256,0,0,0,0,0,0,0,"FunctionalTest",0,
+,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest",0,
+,89,88,256,0,0,0,0,0,0,0,"Testing #1",1,
+,90,88,512,0,0,0,0,0,0,0,"Target",0,
+"sys_refindex",,,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string"
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,
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 b6c9a4f9d4882a2730f222ad161b8beaa3489317..6203f548723211468db14a7aab52308af5fc6e05 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
@@ -3,5 +3,19 @@
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2
,298,89,512,0,0,0,0,0,0,0,0,0,"Testing #1",1
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,
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 8cf12db6500897a557ab10b439b8f8584add534f..0b3c1eecd5425329a25eff79a92f03f618dc6d31 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
@@ -25,7 +25,20 @@
,12,89,1,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
"sys_refindex",,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,
-,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,,,
-,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",0,0,0,"tx_irretutorial_1nff_offer",8,,,,,,,,
-,"b9a9661438343e345038561bedc1204c","tt_content",298,"tx_irretutorial_1nff_hotels",1,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,,,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,,,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,
+,"b9a9661438343e345038561bedc1204c","tt_content",298,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
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 71be440532a34f79eec8d71f86dc31c8665f72f0..fe90e767c2fe0af72fa1196747773bd6bccad158 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
@@ -24,9 +24,19 @@
,12,89,1,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
"sys_refindex",,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,
-,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",0,0,0,"tx_irretutorial_1nff_offer",7,,,,,,,,
-,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",0,0,0,"tx_irretutorial_1nff_offer",5,,,,,,,,
-,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",1,0,0,"tx_irretutorial_1nff_offer",6,,,,,,,,
-,"98e8b23fc53f85a72770efcab764e6ce","tt_content",297,"tx_irretutorial_1nff_hotels",0,0,0,"tx_irretutorial_1nff_hotel",4,,,,,,,,
-,"df4a64b052f8f7c25226afe0ea6c9e6d","tt_content",297,"tx_irretutorial_1nff_hotels",1,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,,,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,,,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,
+,"98e8b23fc53f85a72770efcab764e6ce","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",4,,,,,
+,"df4a64b052f8f7c25226afe0ea6c9e6d","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"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 3fb657b115c08e4394ff3982cc39853c2f09f34d..f226361801d350852a005812aac144a4cec7712e 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
@@ -24,7 +24,16 @@
,12,89,1,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
"sys_refindex",,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,
-,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",0,0,0,"tx_irretutorial_1nff_offer",5,,,,,,,,
-,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",1,0,0,"tx_irretutorial_1nff_offer",6,,,,,,,,
-,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,
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 6e99e8d686b975d7d45ec90d524774e58cf46f79..275af02f59f6009ad490192b97b6098d66a5cf08 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
@@ -24,9 +24,19 @@
,12,89,1,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
"sys_refindex",,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,
-,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",0,0,0,"tx_irretutorial_1nff_offer",5,,,,,,,,
-,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",1,0,0,"tx_irretutorial_1nff_offer",6,,,,,,,,
-,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",0,0,0,"tx_irretutorial_1nff_offer",7,,,,,,,,
-,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,,,
-,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",1,0,0,"tx_irretutorial_1nff_hotel",4,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,,,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,,,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,
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 07f93774ed3609d7137d77e05518450c0f1e5592..ac2577f4159745648f2bf4f7a8122114e5957e4b 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
@@ -24,4 +24,19 @@
,12,89,1,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
,13,90,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
"sys_refindex",,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,,,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,,,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,
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 903c5745876c9e98333cf5c3d5fffa1b630524f9..65e485280144efd2c1dabaeae870410e774f7caa 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
@@ -24,4 +24,19 @@
,12,90,128,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
,13,90,256,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
"sys_refindex",,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,
+,"2dfd3b8e87b9b45f18e0b3c3a7fa2f72","pages",89,"tx_irretutorial_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
+,"d445fd78a1e37837ce5cb8cfca3c3159","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
+,"5925fc8c83fd2759d4dbb7d2e87b9e28","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,0,"tx_irretutorial_1nff_hotel",4,,,,,
+,"43578810ac60f4e31c4c1eb52e37c4cb","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
+,"991035e9a032ce5a95b3dbc7f2f31471","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",5,,,,,
+,"3a59a2c65f05196774ee38fad12b11a8","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,0,"tx_irretutorial_1nff_offer",6,,,,,
+,"fcc697bfb91755f75e07f6ce1784b18b","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",7,,,,,
+,"5f87b200c780cdaad0604f50da06ff64","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,0,"tx_irretutorial_1nff_offer",8,,,,,
+,"a5b1bb284498b3b68a87adda927e894f","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",7,,,,,
+,"6898a967adae0bddf17e30a04cf9c0ad","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",8,,,,,
+,"16a1e406f4a7130e58fb366e932e7508","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,0,"tx_irretutorial_1nff_price",9,,,,,
+,"141f3d182dee9a325a853a0ff79602d9","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",10,,,,,
+,"c6b8bf49d7d73a58a068814db5472e60","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,0,"tx_irretutorial_1nff_price",11,,,,,
+,"bc4f857ec8124fdd793a76e7b45930af","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",12,,,,,
+,"a94608071329f0b81c051da65b9c3e53","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,0,"tx_irretutorial_1nff_price",13,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/LiveDefaultElements.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/LiveDefaultElements.csv
index 39415792cad6806e9395a67ccf212209c3f98b40..486ac035878935009d33e7e9307decc4f59eaa5a 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/LiveDefaultElements.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/LiveDefaultElements.csv
@@ -18,3 +18,10 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image","categories","tx_irretutorial_1nff_hotels",
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",0,2,0,
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",0,2,0,
+"sys_refindex",,,,,,,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,
+,"58b0861c2821b9aa8c036f51c9992938","sys_category",28,"items",,,,0,0,0,"tt_content",297,,,,,
+,"a902304805e24ea0d57feaeb08d5c898","sys_category",29,"items",,,,0,0,0,"tt_content",297,,,,,
+,"4cf35307d2ebd8521d82d598a9d6fb37","sys_category",29,"items",,,,1,0,0,"tt_content",298,,,,,
+,"a39d4a457c3043438f34193027cdb8dc","sys_category",30,"items",,,,0,0,0,"tt_content",298,,,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/ActionTest.php b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/ActionTest.php
index b168239740a3092b2228581477cec24735060402..a8ec8f488236fd4bef84b109a2f3493cf8c883ca 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/ActionTest.php
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/ActionTest.php
@@ -28,8 +28,13 @@ class ActionTest extends AbstractActionTestCase
protected $assertionDataSetDirectory = 'typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/';
/**
- * MM Relations
+ * @test
*/
+ public function verifyCleanReferenceIndex()
+ {
+ // The test verifies the imported data set has a clean reference index by the check in tearDown()
+ self::assertTrue(true);
+ }
/**
* @test
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/addCategoryRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/addCategoryRelation.csv
index 04da54550a9205651ace37ca162d575a33ccb45a..6b10f18d281224c0f04dde889b2ad01e90e30502 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/addCategoryRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/addCategoryRelation.csv
@@ -16,6 +16,10 @@
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",0,3
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
-,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",0,0,0,"sys_category",28,,,,,,
-,"954980b97a4b7ef8ddc8247c3203ba72","sys_category",31,"items",0,0,0,"tt_content",297,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"58b0861c2821b9aa8c036f51c9992938","sys_category",28,"items",,,,0,0,0,"tt_content",297,,,
+,"a902304805e24ea0d57feaeb08d5c898","sys_category",29,"items",,,,0,0,0,"tt_content",297,,,
+,"4cf35307d2ebd8521d82d598a9d6fb37","sys_category",29,"items",,,,1,0,0,"tt_content",298,,,
+,"a39d4a457c3043438f34193027cdb8dc","sys_category",30,"items",,,,0,0,0,"tt_content",298,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,
+,"954980b97a4b7ef8ddc8247c3203ba72","sys_category",31,"items",,,,0,0,0,"tt_content",297,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/changeCategoryRelationSorting.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/changeCategoryRelationSorting.csv
index 26099b6e29a9c8b70e3698cac0f8789224ddb72a..278e416925a4097a03faba9ab675f28649bd41d1 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/changeCategoryRelationSorting.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/changeCategoryRelationSorting.csv
@@ -15,4 +15,9 @@
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",0,2
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"58b0861c2821b9aa8c036f51c9992938","sys_category",28,"items",,,,0,0,0,"tt_content",297,,,
+,"a902304805e24ea0d57feaeb08d5c898","sys_category",29,"items",,,,0,0,0,"tt_content",297,,,
+,"4cf35307d2ebd8521d82d598a9d6fb37","sys_category",29,"items",,,,1,0,0,"tt_content",298,,,
+,"a39d4a457c3043438f34193027cdb8dc","sys_category",30,"items",,,,0,0,0,"tt_content",298,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyCategoryOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyCategoryOfRelation.csv
index 9dfbbb84c4bb3243dcc607189ede90941cc552da..b7896766043ca3fc06a50cc5194a4e05b3697ae2 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyCategoryOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyCategoryOfRelation.csv
@@ -17,5 +17,10 @@
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",0,2
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
-,"4db35911376aeec53206986a1345fdeb","sys_category",32,"items",0,0,0,"tt_content",297,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"58b0861c2821b9aa8c036f51c9992938","sys_category",28,"items",,,,0,0,0,"tt_content",297,,,
+,"a902304805e24ea0d57feaeb08d5c898","sys_category",29,"items",,,,0,0,0,"tt_content",297,,,
+,"4cf35307d2ebd8521d82d598a9d6fb37","sys_category",29,"items",,,,1,0,0,"tt_content",298,,,
+,"a39d4a457c3043438f34193027cdb8dc","sys_category",30,"items",,,,0,0,0,"tt_content",298,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,
+,"4db35911376aeec53206986a1345fdeb","sys_category",32,"items",,,,0,0,0,"tt_content",297,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyCategoryToLanguageOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyCategoryToLanguageOfRelation.csv
index 78af304bbc619847cdcb975df2fee4e0c0bfa871..44ac6002e9b86e505650e865501772010c5d7b9d 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyCategoryToLanguageOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyCategoryToLanguageOfRelation.csv
@@ -17,5 +17,10 @@
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",0,2
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
-,"4db35911376aeec53206986a1345fdeb","sys_category",32,"items",0,0,0,"tt_content",297,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"58b0861c2821b9aa8c036f51c9992938","sys_category",28,"items",,,,0,0,0,"tt_content",297,,,
+,"a902304805e24ea0d57feaeb08d5c898","sys_category",29,"items",,,,0,0,0,"tt_content",297,,,
+,"4cf35307d2ebd8521d82d598a9d6fb37","sys_category",29,"items",,,,1,0,0,"tt_content",298,,,
+,"a39d4a457c3043438f34193027cdb8dc","sys_category",30,"items",,,,0,0,0,"tt_content",298,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,
+,"4db35911376aeec53206986a1345fdeb","sys_category",32,"items",,,,0,0,0,"tt_content",297,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyContentOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyContentOfRelation.csv
index bfe2422f39f5d9640227d616ace88a28e81ce2f0..e8145af515d605c1b52a87e991e1fc339df5e497 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyContentOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyContentOfRelation.csv
@@ -18,9 +18,11 @@
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
,299,89,128,0,0,0,298,0,0,0,0,0,"Regular Element #2 (copy 1)",0,2
"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
-,"a902304805e24ea0d57feaeb08d5c898","sys_category",29,"items",0,0,0,"tt_content",297,,,,,,
-,"4cf35307d2ebd8521d82d598a9d6fb37","sys_category",29,"items",1,0,0,"tt_content",298,,,,,,
-,"23ca9e322abe5b6db427dbc0eb9e0e82","sys_category",29,"items",2,0,0,"tt_content",299,,,,,,
-,"a39d4a457c3043438f34193027cdb8dc","sys_category",30,"items",0,0,0,"tt_content",298,,,,,,
-,"750cd52a56d90cdd5b3391369fd5687e","sys_category",30,"items",1,0,0,"tt_content",299,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"58b0861c2821b9aa8c036f51c9992938","sys_category",28,"items",,,,0,0,0,"tt_content",297,,,
+,"a902304805e24ea0d57feaeb08d5c898","sys_category",29,"items",,,,0,0,0,"tt_content",297,,,
+,"4cf35307d2ebd8521d82d598a9d6fb37","sys_category",29,"items",,,,1,0,0,"tt_content",298,,,
+,"a39d4a457c3043438f34193027cdb8dc","sys_category",30,"items",,,,0,0,0,"tt_content",298,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,
+,"23ca9e322abe5b6db427dbc0eb9e0e82","sys_category",29,"items",,,,2,0,0,"tt_content",299,,,
+,"750cd52a56d90cdd5b3391369fd5687e","sys_category",30,"items",,,,1,0,0,"tt_content",299,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyContentToLanguageOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyContentToLanguageOfRelation.csv
index 71ba8216c83bc44f54a863e0b6e53d04ab255257..82116c44212f66aa83847edc4bafdc6a75823150 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyContentToLanguageOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyContentToLanguageOfRelation.csv
@@ -18,9 +18,11 @@
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
,299,89,768,0,1,0,298,0,0,0,0,0,"[Translate to Dansk:] Regular Element #2",0,2
"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
-,"a902304805e24ea0d57feaeb08d5c898","sys_category",29,"items",0,0,0,"tt_content",297,,,,,,
-,"4cf35307d2ebd8521d82d598a9d6fb37","sys_category",29,"items",1,0,0,"tt_content",298,,,,,,
-,"23ca9e322abe5b6db427dbc0eb9e0e82","sys_category",29,"items",2,0,0,"tt_content",299,,,,,,
-,"a39d4a457c3043438f34193027cdb8dc","sys_category",30,"items",0,0,0,"tt_content",298,,,,,,
-,"750cd52a56d90cdd5b3391369fd5687e","sys_category",30,"items",1,0,0,"tt_content",299,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"58b0861c2821b9aa8c036f51c9992938","sys_category",28,"items",,,,0,0,0,"tt_content",297,,,
+,"a902304805e24ea0d57feaeb08d5c898","sys_category",29,"items",,,,0,0,0,"tt_content",297,,,
+,"4cf35307d2ebd8521d82d598a9d6fb37","sys_category",29,"items",,,,1,0,0,"tt_content",298,,,
+,"a39d4a457c3043438f34193027cdb8dc","sys_category",30,"items",,,,0,0,0,"tt_content",298,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,
+,"23ca9e322abe5b6db427dbc0eb9e0e82","sys_category",29,"items",,,,2,0,0,"tt_content",299,,,
+,"750cd52a56d90cdd5b3391369fd5687e","sys_category",30,"items",,,,1,0,0,"tt_content",299,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyPage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyPage.csv
index 1a216c92e5a1b8b940a99c72459ecd2c03eead68..e3ead460cba3fb66405ea06cfca4684a75bd6c67 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyPage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/copyPage.csv
@@ -28,12 +28,13 @@
,299,91,256,0,0,0,298,0,0,0,0,0,"Regular Element #2",0,2
,300,91,128,0,0,0,297,0,0,0,0,0,"Regular Element #1",0,2
"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
-,"a902304805e24ea0d57feaeb08d5c898","sys_category",29,"items",0,0,0,"tt_content",297,,,,,,
-,"4cf35307d2ebd8521d82d598a9d6fb37","sys_category",29,"items",1,0,0,"tt_content",298,,,,,,
-,"23ca9e322abe5b6db427dbc0eb9e0e82","sys_category",29,"items",2,0,0,"tt_content",299,,,,,,
-,"a39d4a457c3043438f34193027cdb8dc","sys_category",30,"items",0,0,0,"tt_content",298,,,,,,
-,"750cd52a56d90cdd5b3391369fd5687e","sys_category",30,"items",1,0,0,"tt_content",299,,,,,,
-,"58b0861c2821b9aa8c036f51c9992938","sys_category",28,"items",0,0,0,"tt_content",297,,,,,,
-,"070b62e79951dccae59a96df8b6ce1f6","sys_category",28,"items",1,0,0,"tt_content",300,,,,,,
-,"66ac80d4d06f22cfc2d4adb80f76237c","sys_category",29,"items",3,0,0,"tt_content",300,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"58b0861c2821b9aa8c036f51c9992938","sys_category",28,"items",,,,0,0,0,"tt_content",297,,,
+,"a902304805e24ea0d57feaeb08d5c898","sys_category",29,"items",,,,0,0,0,"tt_content",297,,,
+,"4cf35307d2ebd8521d82d598a9d6fb37","sys_category",29,"items",,,,1,0,0,"tt_content",298,,,
+,"a39d4a457c3043438f34193027cdb8dc","sys_category",30,"items",,,,0,0,0,"tt_content",298,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,
+,"23ca9e322abe5b6db427dbc0eb9e0e82","sys_category",29,"items",,,,2,0,0,"tt_content",299,,,
+,"66ac80d4d06f22cfc2d4adb80f76237c","sys_category",29,"items",,,,3,0,0,"tt_content",300,,,
+,"750cd52a56d90cdd5b3391369fd5687e","sys_category",30,"items",,,,1,0,0,"tt_content",299,,,
+,"070b62e79951dccae59a96df8b6ce1f6","sys_category",28,"items",,,,1,0,0,"tt_content",300,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/deleteCategoryOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/deleteCategoryOfRelation.csv
index 280c119ee0bef5ca95bd96b834796bc8253db953..e81148fb6b8c6765ec4cfd7a662ff439476e38ac 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/deleteCategoryOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/deleteCategoryOfRelation.csv
@@ -15,5 +15,9 @@
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",0,2
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
-,"eace96ae219b2d17098e3768c23411f4","sys_category",28,"items",0,1,0,"tt_content",297,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"a902304805e24ea0d57feaeb08d5c898","sys_category",29,"items",,,,0,0,0,"tt_content",297,,,
+,"4cf35307d2ebd8521d82d598a9d6fb37","sys_category",29,"items",,,,1,0,0,"tt_content",298,,,
+,"a39d4a457c3043438f34193027cdb8dc","sys_category",30,"items",,,,0,0,0,"tt_content",298,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,
+,"eace96ae219b2d17098e3768c23411f4","sys_category",28,"items",,,,0,1,0,"tt_content",297,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/deleteCategoryRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/deleteCategoryRelation.csv
index 58d081b38bd1845c93627c8081b52abfd6efaa26..24d4bb58b3240cc0407e51b30f3ac0e6d8fbb3d3 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/deleteCategoryRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/deleteCategoryRelation.csv
@@ -14,5 +14,8 @@
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",0,1
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
-,"7be39acb66aae4f39ef673daa1970cd7","sys_category",29,"items",0,0,0,"tt_content",298,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"58b0861c2821b9aa8c036f51c9992938","sys_category",28,"items",,,,0,0,0,"tt_content",297,,,
+,"a39d4a457c3043438f34193027cdb8dc","sys_category",30,"items",,,,0,0,0,"tt_content",298,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,
+,"7be39acb66aae4f39ef673daa1970cd7","sys_category",29,"items",,,,0,0,0,"tt_content",298,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/deleteContentOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/deleteContentOfRelation.csv
index 4d9f1259a4f2ce203cc84127bf71051636d08f43..2f8c4322ca855507e8625cec2f58d09bbeb2e6e0 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/deleteContentOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/deleteContentOfRelation.csv
@@ -15,7 +15,9 @@
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",0,2
,298,89,512,1,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
-,"a39d4a457c3043438f34193027cdb8dc","sys_category",30,"items",0,0,0,"tt_content",298,,,,,,
-,"a902304805e24ea0d57feaeb08d5c898","sys_category",29,"items",0,0,0,"tt_content",297,,,,,,
-,"4cf35307d2ebd8521d82d598a9d6fb37","sys_category",29,"items",1,0,0,"tt_content",298,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"58b0861c2821b9aa8c036f51c9992938","sys_category",28,"items",,,,0,0,0,"tt_content",297,,,
+,"a902304805e24ea0d57feaeb08d5c898","sys_category",29,"items",,,,0,0,0,"tt_content",297,,,
+,"4cf35307d2ebd8521d82d598a9d6fb37","sys_category",29,"items",,,,1,0,0,"tt_content",298,,,
+,"a39d4a457c3043438f34193027cdb8dc","sys_category",30,"items",,,,0,0,0,"tt_content",298,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeCategoryOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeCategoryOfRelation.csv
index d4ac5775df51a56905f4dbd201f5ab8e1f0260d5..0ecf4f2994cdf54747ab720dcfecbf8117b8b89d 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeCategoryOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeCategoryOfRelation.csv
@@ -17,8 +17,13 @@
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",0,2
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,
-,"f156910d0a80fef42f1004245ba90d9a","sys_category",32,"l10n_parent",0,0,0,"sys_category",28,,,,,,
-,"4db35911376aeec53206986a1345fdeb","sys_category",32,"items",0,0,0,"tt_content",297,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"58b0861c2821b9aa8c036f51c9992938","sys_category",28,"items",,,,0,0,0,"tt_content",297,,,
+,"a902304805e24ea0d57feaeb08d5c898","sys_category",29,"items",,,,0,0,0,"tt_content",297,,,
+,"4cf35307d2ebd8521d82d598a9d6fb37","sys_category",29,"items",,,,1,0,0,"tt_content",298,,,
+,"a39d4a457c3043438f34193027cdb8dc","sys_category",30,"items",,,,0,0,0,"tt_content",298,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,
+,"f156910d0a80fef42f1004245ba90d9a","sys_category",32,"l10n_parent",,,,0,0,0,"sys_category",28,,,
+,"4db35911376aeec53206986a1345fdeb","sys_category",32,"items",,,,0,0,0,"tt_content",297,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeContentChainOfRelationNAddCategoryWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeContentChainOfRelationNAddCategoryWSynchronization.csv
index f4a051dc2198b611874b5e36334c446dccfdb89b..2b2e66c092ea95c992b0b27275331b15a763b5e3 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeContentChainOfRelationNAddCategoryWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeContentChainOfRelationNAddCategoryWSynchronization.csv
@@ -19,22 +19,23 @@
,31,300,"tt_content",0,3,"categories",,,,,,,,,,
"tt_content",,,,,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image","categories","l10n_state"
-,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",0,2,\NULL
-,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",0,3,\NULL
+,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",0,2,"\NULL"
+,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",0,3,"\NULL"
,299,89,768,0,1,298,298,0,0,0,0,0,"[Translate to Dansk:] Regular Element #2",0,3,"{""categories"":""parent""}"
,300,89,1024,0,2,298,299,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #2",0,3,"{""categories"":""source""}"
"sys_refindex",,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,
-,"aa9d44bd50d47873e29c5a4987bda6e0","tt_content",299,"l18n_parent",0,0,0,"tt_content",298,,,,,,,
-,"a902304805e24ea0d57feaeb08d5c898","sys_category",29,"items",0,0,0,"tt_content",297,,,,,,,
-,"4cf35307d2ebd8521d82d598a9d6fb37","sys_category",29,"items",1,0,0,"tt_content",298,,,,,,,
-,"23ca9e322abe5b6db427dbc0eb9e0e82","sys_category",29,"items",2,0,0,"tt_content",299,,,,,,,
-,"a39d4a457c3043438f34193027cdb8dc","sys_category",30,"items",0,0,0,"tt_content",298,,,,,,,
-,"750cd52a56d90cdd5b3391369fd5687e","sys_category",30,"items",1,0,0,"tt_content",299,,,,,,,
-,"ff5b07a6c39d986fcf41e56dacc4e181","tt_content",300,"l18n_parent",0,0,0,"tt_content",298,,,,,,,
-,"66ac80d4d06f22cfc2d4adb80f76237c","sys_category",29,"items",3,0,0,"tt_content",300,,,,,,,
-,"6a60dec91e5f0189e5ae580a31871cbf","sys_category",30,"items",2,0,0,"tt_content",300,,,,,,,
-,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",0,0,0,"sys_category",28,,,,,,,
-,"dd30f600ad0a858555721099eac5fbe9","sys_category",31,"items",0,0,0,"tt_content",298,,,,,,,
-,"ab79dcb5d83715fd8453d9d301a82e29","sys_category",31,"items",1,0,0,"tt_content",299,,,,,,,
-,"7e11bf76f1210ab7ab415c8e5708e1f2","sys_category",31,"items",2,0,0,"tt_content",300,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,
+,"58b0861c2821b9aa8c036f51c9992938","sys_category",28,"items",,,,0,0,0,"tt_content",297,,,,
+,"a902304805e24ea0d57feaeb08d5c898","sys_category",29,"items",,,,0,0,0,"tt_content",297,,,,
+,"4cf35307d2ebd8521d82d598a9d6fb37","sys_category",29,"items",,,,1,0,0,"tt_content",298,,,,
+,"a39d4a457c3043438f34193027cdb8dc","sys_category",30,"items",,,,0,0,0,"tt_content",298,,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,,
+,"aa9d44bd50d47873e29c5a4987bda6e0","tt_content",299,"l18n_parent",,,,0,0,0,"tt_content",298,,,,
+,"23ca9e322abe5b6db427dbc0eb9e0e82","sys_category",29,"items",,,,2,0,0,"tt_content",299,,,,
+,"750cd52a56d90cdd5b3391369fd5687e","sys_category",30,"items",,,,1,0,0,"tt_content",299,,,,
+,"ff5b07a6c39d986fcf41e56dacc4e181","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",298,,,,
+,"66ac80d4d06f22cfc2d4adb80f76237c","sys_category",29,"items",,,,3,0,0,"tt_content",300,,,,
+,"6a60dec91e5f0189e5ae580a31871cbf","sys_category",30,"items",,,,2,0,0,"tt_content",300,,,,
+,"dd30f600ad0a858555721099eac5fbe9","sys_category",31,"items",,,,0,0,0,"tt_content",298,,,,
+,"ab79dcb5d83715fd8453d9d301a82e29","sys_category",31,"items",,,,1,0,0,"tt_content",299,,,,
+,"7e11bf76f1210ab7ab415c8e5708e1f2","sys_category",31,"items",,,,2,0,0,"tt_content",300,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeContentOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeContentOfRelation.csv
index d7c8ecbf08108afd7a9ba7c5443def538345b862..f12fa4a8dd4f572dae3cfeba6c421ae91e175167 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeContentOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeContentOfRelation.csv
@@ -18,10 +18,12 @@
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
,299,89,768,0,1,298,298,0,0,0,0,0,"[Translate to Dansk:] Regular Element #2",0,2
"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
-,"aa9d44bd50d47873e29c5a4987bda6e0","tt_content",299,"l18n_parent",0,0,0,"tt_content",298,,,,,,
-,"a902304805e24ea0d57feaeb08d5c898","sys_category",29,"items",0,0,0,"tt_content",297,,,,,,
-,"4cf35307d2ebd8521d82d598a9d6fb37","sys_category",29,"items",1,0,0,"tt_content",298,,,,,,
-,"23ca9e322abe5b6db427dbc0eb9e0e82","sys_category",29,"items",2,0,0,"tt_content",299,,,,,,
-,"a39d4a457c3043438f34193027cdb8dc","sys_category",30,"items",0,0,0,"tt_content",298,,,,,,
-,"750cd52a56d90cdd5b3391369fd5687e","sys_category",30,"items",1,0,0,"tt_content",299,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"58b0861c2821b9aa8c036f51c9992938","sys_category",28,"items",,,,0,0,0,"tt_content",297,,,
+,"a902304805e24ea0d57feaeb08d5c898","sys_category",29,"items",,,,0,0,0,"tt_content",297,,,
+,"4cf35307d2ebd8521d82d598a9d6fb37","sys_category",29,"items",,,,1,0,0,"tt_content",298,,,
+,"a39d4a457c3043438f34193027cdb8dc","sys_category",30,"items",,,,0,0,0,"tt_content",298,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,
+,"aa9d44bd50d47873e29c5a4987bda6e0","tt_content",299,"l18n_parent",,,,0,0,0,"tt_content",298,,,
+,"23ca9e322abe5b6db427dbc0eb9e0e82","sys_category",29,"items",,,,2,0,0,"tt_content",299,,,
+,"750cd52a56d90cdd5b3391369fd5687e","sys_category",30,"items",,,,1,0,0,"tt_content",299,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeContentOfRelationNAddCategoryWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeContentOfRelationNAddCategoryWSynchronization.csv
index 39024e44605b47e567df2472501f9f6552e1b6f6..3c5994d6b721477cb46f29bced66f8df413d0209 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeContentOfRelationNAddCategoryWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeContentOfRelationNAddCategoryWSynchronization.csv
@@ -16,17 +16,18 @@
,31,299,"tt_content",0,3,"categories",,,,,,,,,,
"tt_content",,,,,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image","categories","l10n_state"
-,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",0,2,\NULL
-,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",0,3,\NULL
+,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",0,2,"\NULL"
+,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",0,3,"\NULL"
,299,89,768,0,1,298,298,0,0,0,0,0,"[Translate to Dansk:] Regular Element #2",0,3,"{""categories"":""parent""}"
"sys_refindex",,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,
-,"aa9d44bd50d47873e29c5a4987bda6e0","tt_content",299,"l18n_parent",0,0,0,"tt_content",298,,,,,,,
-,"a902304805e24ea0d57feaeb08d5c898","sys_category",29,"items",0,0,0,"tt_content",297,,,,,,,
-,"4cf35307d2ebd8521d82d598a9d6fb37","sys_category",29,"items",1,0,0,"tt_content",298,,,,,,,
-,"23ca9e322abe5b6db427dbc0eb9e0e82","sys_category",29,"items",2,0,0,"tt_content",299,,,,,,,
-,"a39d4a457c3043438f34193027cdb8dc","sys_category",30,"items",0,0,0,"tt_content",298,,,,,,,
-,"750cd52a56d90cdd5b3391369fd5687e","sys_category",30,"items",1,0,0,"tt_content",299,,,,,,,
-,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",0,0,0,"sys_category",28,,,,,,,
-,"dd30f600ad0a858555721099eac5fbe9","sys_category",31,"items",0,0,0,"tt_content",298,,,,,,,
-,"ab79dcb5d83715fd8453d9d301a82e29","sys_category",31,"items",1,0,0,"tt_content",299,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,
+,"58b0861c2821b9aa8c036f51c9992938","sys_category",28,"items",,,,0,0,0,"tt_content",297,,,,
+,"a902304805e24ea0d57feaeb08d5c898","sys_category",29,"items",,,,0,0,0,"tt_content",297,,,,
+,"4cf35307d2ebd8521d82d598a9d6fb37","sys_category",29,"items",,,,1,0,0,"tt_content",298,,,,
+,"a39d4a457c3043438f34193027cdb8dc","sys_category",30,"items",,,,0,0,0,"tt_content",298,,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,,
+,"aa9d44bd50d47873e29c5a4987bda6e0","tt_content",299,"l18n_parent",,,,0,0,0,"tt_content",298,,,,
+,"23ca9e322abe5b6db427dbc0eb9e0e82","sys_category",29,"items",,,,2,0,0,"tt_content",299,,,,
+,"750cd52a56d90cdd5b3391369fd5687e","sys_category",30,"items",,,,1,0,0,"tt_content",299,,,,
+,"dd30f600ad0a858555721099eac5fbe9","sys_category",31,"items",,,,0,0,0,"tt_content",298,,,,
+,"ab79dcb5d83715fd8453d9d301a82e29","sys_category",31,"items",,,,1,0,0,"tt_content",299,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeContentOfRelationWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeContentOfRelationWSynchronization.csv
index 74be9ea7fe5348319615d34fe64c4d9d1a8734ae..638ff8eace19d75c1dc87f76c5b1d16b878ee06d 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeContentOfRelationWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/localizeContentOfRelationWSynchronization.csv
@@ -14,14 +14,16 @@
,30,299,"tt_content",0,2,"categories",,,,,,,,,,
"tt_content",,,,,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image","categories","l10n_state"
-,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",0,2,\NULL
-,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",0,2,\NULL
+,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",0,2,"\NULL"
+,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",0,2,"\NULL"
,299,89,768,0,1,298,298,0,0,0,0,0,"[Translate to Dansk:] Regular Element #2",0,2,"{""categories"":""parent""}"
"sys_refindex",,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,
-,"aa9d44bd50d47873e29c5a4987bda6e0","tt_content",299,"l18n_parent",0,0,0,"tt_content",298,,,,,,,
-,"a902304805e24ea0d57feaeb08d5c898","sys_category",29,"items",0,0,0,"tt_content",297,,,,,,,
-,"4cf35307d2ebd8521d82d598a9d6fb37","sys_category",29,"items",1,0,0,"tt_content",298,,,,,,,
-,"23ca9e322abe5b6db427dbc0eb9e0e82","sys_category",29,"items",2,0,0,"tt_content",299,,,,,,,
-,"a39d4a457c3043438f34193027cdb8dc","sys_category",30,"items",0,0,0,"tt_content",298,,,,,,,
-,"750cd52a56d90cdd5b3391369fd5687e","sys_category",30,"items",1,0,0,"tt_content",299,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,
+,"58b0861c2821b9aa8c036f51c9992938","sys_category",28,"items",,,,0,0,0,"tt_content",297,,,,
+,"a902304805e24ea0d57feaeb08d5c898","sys_category",29,"items",,,,0,0,0,"tt_content",297,,,,
+,"4cf35307d2ebd8521d82d598a9d6fb37","sys_category",29,"items",,,,1,0,0,"tt_content",298,,,,
+,"a39d4a457c3043438f34193027cdb8dc","sys_category",30,"items",,,,0,0,0,"tt_content",298,,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,,
+,"aa9d44bd50d47873e29c5a4987bda6e0","tt_content",299,"l18n_parent",,,,0,0,0,"tt_content",298,,,,
+,"23ca9e322abe5b6db427dbc0eb9e0e82","sys_category",29,"items",,,,2,0,0,"tt_content",299,,,,
+,"750cd52a56d90cdd5b3391369fd5687e","sys_category",30,"items",,,,1,0,0,"tt_content",299,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/modifyBothsOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/modifyBothsOfRelation.csv
index 662316a6a4bf6e9ffa511cda98c732e7d3669c38..b261276ce2644c23f2cdfa9255ac1337750fe21e 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/modifyBothsOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/modifyBothsOfRelation.csv
@@ -15,5 +15,9 @@
,297,89,256,0,0,0,0,0,0,0,0,0,"Testing #1",0,2
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
-,"58b0861c2821b9aa8c036f51c9992938","sys_category",28,"items",0,0,0,"tt_content",297,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"58b0861c2821b9aa8c036f51c9992938","sys_category",28,"items",,,,0,0,0,"tt_content",297,,,
+,"a902304805e24ea0d57feaeb08d5c898","sys_category",29,"items",,,,0,0,0,"tt_content",297,,,
+,"4cf35307d2ebd8521d82d598a9d6fb37","sys_category",29,"items",,,,1,0,0,"tt_content",298,,,
+,"a39d4a457c3043438f34193027cdb8dc","sys_category",30,"items",,,,0,0,0,"tt_content",298,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/modifyCategoryOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/modifyCategoryOfRelation.csv
index eaf10c3571af61ccabce203ff46eececa15bb66a..6db2fb0cdb2051ec338b872c26b2fca4cc08f2c3 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/modifyCategoryOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/modifyCategoryOfRelation.csv
@@ -15,5 +15,9 @@
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",0,2
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
-,"58b0861c2821b9aa8c036f51c9992938","sys_category",28,"items",0,0,0,"tt_content",297,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"58b0861c2821b9aa8c036f51c9992938","sys_category",28,"items",,,,0,0,0,"tt_content",297,,,
+,"a902304805e24ea0d57feaeb08d5c898","sys_category",29,"items",,,,0,0,0,"tt_content",297,,,
+,"4cf35307d2ebd8521d82d598a9d6fb37","sys_category",29,"items",,,,1,0,0,"tt_content",298,,,
+,"a39d4a457c3043438f34193027cdb8dc","sys_category",30,"items",,,,0,0,0,"tt_content",298,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/modifyContentOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/modifyContentOfRelation.csv
index c7a3140d86463b3d24530bd77ad8089ca82b0dbd..7e38efb9b66b2c7919b8a85383d2f71ecf30b525 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/modifyContentOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/modifyContentOfRelation.csv
@@ -15,4 +15,9 @@
,297,89,256,0,0,0,0,0,0,0,0,0,"Testing #1",0,2
,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"58b0861c2821b9aa8c036f51c9992938","sys_category",28,"items",,,,0,0,0,"tt_content",297,,,
+,"a902304805e24ea0d57feaeb08d5c898","sys_category",29,"items",,,,0,0,0,"tt_content",297,,,
+,"4cf35307d2ebd8521d82d598a9d6fb37","sys_category",29,"items",,,,1,0,0,"tt_content",298,,,
+,"a39d4a457c3043438f34193027cdb8dc","sys_category",30,"items",,,,0,0,0,"tt_content",298,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/moveContentOfRelationToDifferentPage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/moveContentOfRelationToDifferentPage.csv
index 7be3110bbd0513b536fb38a358cec9562eca5561..7df47c74a98c409925e3b518604f9755554e38b7 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/moveContentOfRelationToDifferentPage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/moveContentOfRelationToDifferentPage.csv
@@ -15,4 +15,9 @@
,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",0,2
,298,90,256,0,0,0,0,0,0,0,0,0,"Regular Element #2",0,2
"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"58b0861c2821b9aa8c036f51c9992938","sys_category",28,"items",,,,0,0,0,"tt_content",297,,,
+,"a902304805e24ea0d57feaeb08d5c898","sys_category",29,"items",,,,0,0,0,"tt_content",297,,,
+,"4cf35307d2ebd8521d82d598a9d6fb37","sys_category",29,"items",,,,1,0,0,"tt_content",298,,,
+,"a39d4a457c3043438f34193027cdb8dc","sys_category",30,"items",,,,0,0,0,"tt_content",298,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/LiveDefaultElements.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/LiveDefaultElements.csv
index 4f4a08d491b594299c475a45d8f5cdb07c7a1c4e..a130539b8e454db6dcd80168512dbe43a42430b3 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/LiveDefaultElements.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/LiveDefaultElements.csv
@@ -17,3 +17,9 @@
,300,89,1024,0,1,299,299,299,0,0,0,0,0,"[Translate to Dansk:] Regular Element #3",,,
,301,89,384,0,1,297,297,297,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1",,,
,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1",,,
+"sys_refindex",,,,,,,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,,,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,,,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/ActionTest.php b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/ActionTest.php
index fceac08e87f49e58afa3fda104099fefd6d5eb89..c8850129e33c8a3648e49744a79b2d3012b5f7b7 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/ActionTest.php
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/ActionTest.php
@@ -32,8 +32,13 @@ class ActionTest extends AbstractActionTestCase
protected $assertionDataSetDirectory = 'typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/';
/**
- * Content records
+ * @test
*/
+ public function verifyCleanReferenceIndex()
+ {
+ // The test verifies the imported data set has a clean reference index by the check in tearDown()
+ self::assertTrue(true);
+ }
/**
* @test
@@ -272,6 +277,10 @@ class ActionTest extends AbstractActionTestCase
$responseSections = $this->getFrontendResponse(self::VALUE_PageId, self::VALUE_LanguageId)->getResponseSections();
self::assertThat($responseSections, $this->getRequestSectionHasRecordConstraint()
->setTable(self::TABLE_Content)->setField('header')->setValues('[Translate to Dansk:] Regular Element #1', '[Translate to Dansk:] Regular Element #2'));
+
+ // Due to the changed TCA columns passthrough vs select, reference index updates are performed
+ // differently for this test. We disable the 'clean refindex' test in tearDown() here.
+ $this->assertCleanReferenceIndex = false;
}
/**
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSorting.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSorting.csv
index 3e4310236f85ebffccd3f6c87315e0be8e75d499..145bee0e581d42f2d97e44a12f21730fdab54023 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSorting.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSorting.csv
@@ -8,4 +8,8 @@
,301,89,384,0,1,297,297,297,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1"
,302,89,192,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSortingAfterSelf.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSortingAfterSelf.csv
index 860c80eda01a11477c4c85f3071ba8538ff627f3..061927a4ab587a4a603e3da4f087bf9c28e7129c 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSortingAfterSelf.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/changeContentSortingAfterSelf.csv
@@ -8,4 +8,8 @@
,301,89,384,0,1,297,297,297,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1"
,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/changePageSorting.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/changePageSorting.csv
index da210fa216613961878bf36267d1d7f9b8a2314e..888e9a0c99ff18b4f63c165cb93aa4723e49fa00 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/changePageSorting.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/changePageSorting.csv
@@ -1,8 +1,12 @@
-"pages",,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","slug"
-,1,0,256,0,0,0,0,0,0,0,"FunctionalTest","/"
-,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest","/data-handler"
-,89,88,768,0,0,0,0,0,0,0,"Relations","/data-handler/relations"
-,90,88,512,0,0,0,0,0,0,0,"Target","/data-handler/target"
-"sys_refindex",,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,
+"pages",,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","slug",
+,1,0,256,0,0,0,0,0,0,0,"FunctionalTest","/",
+,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest","/data-handler",
+,89,88,768,0,0,0,0,0,0,0,"Relations","/data-handler/relations",
+,90,88,512,0,0,0,0,0,0,0,"Target","/data-handler/target",
+"sys_refindex",,,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string"
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/changePageSortingAfterSelf.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/changePageSortingAfterSelf.csv
index 17f4a59ff3e33d56b9159b3f44ed7b0c95cedd4e..88e8ab9ae4bb455dee246e14a71f470fe72b7d42 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/changePageSortingAfterSelf.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/changePageSortingAfterSelf.csv
@@ -1,8 +1,12 @@
-"pages",,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","slug"
-,1,0,256,0,0,0,0,0,0,0,"FunctionalTest","/"
-,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest","/data-handler"
-,89,88,256,0,0,0,0,0,0,0,"Relations","/data-handler/relations"
-,90,88,512,0,0,0,0,0,0,0,"Target","/data-handler/target"
-"sys_refindex",,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,
+"pages",,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","slug",
+,1,0,256,0,0,0,0,0,0,0,"FunctionalTest","/",
+,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest","/data-handler",
+,89,88,256,0,0,0,0,0,0,0,"Relations","/data-handler/relations",
+,90,88,512,0,0,0,0,0,0,0,"Target","/data-handler/target",
+"sys_refindex",,,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string"
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContent.csv
index f9fee5504012d8db814a7b3d6088acd4fde4944b..98566d6f5eb2c4107f6809ec8c9eb0a32459c6c9 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContent.csv
@@ -9,4 +9,8 @@
,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
,303,89,128,0,0,0,0,298,0,0,0,0,0,"Regular Element #2 (copy 1)"
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguage.csv
index 010648021108f701e5ce277347ab205c5b226b0e..6597d96191d017c11e38f5451c28ac4555e79fab 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguage.csv
@@ -9,6 +9,10 @@
,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
,303,89,416,0,1,0,298,298,0,0,0,0,0,"[Translate to Dansk:] Regular Element #2"
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv
index 3aaf32fcc320c653af6acf62f1a5fe56026d7ed5..6955a9691b95958f1b09d70afb7f6dbd21d7c543 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageFromNonDefaultLanguage.csv
@@ -9,8 +9,12 @@
,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
,303,89,1280,0,2,0,300,300,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #3"
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"595e5e033f510dde7c921d3381b382c4","pages",92,"l10n_parent",0,0,0,"pages",89,,,,,
-,"d9b676030a71bcc2e059eb713ec3aac0","pages",92,"sys_language_uid",0,0,0,"sys_language",2,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"595e5e033f510dde7c921d3381b382c4","pages",92,"l10n_parent",,,,0,0,0,"pages",89,,
+,"d9b676030a71bcc2e059eb713ec3aac0","pages",92,"sys_language_uid",,,,0,0,0,"sys_language",2,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageWExclude.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageWExclude.csv
index 6a07f09d408fd2caa2f50870547abf3f00cf34ac..4a190bd61a978e1e7d2d59f5cc6ae3ddc5574ade 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageWExclude.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageWExclude.csv
@@ -2,13 +2,17 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l10n_source","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","l10n_state"
,296,88,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #0",
,297,89,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #1",
-,298,89,512,0,0,0,0,0,0,0,0,0,0,"Testing #1",\NULL
+,298,89,512,0,0,0,0,0,0,0,0,0,0,"Testing #1","\NULL"
,299,89,768,0,0,0,0,0,0,0,0,0,0,"Regular Element #3",
,300,89,1024,0,1,299,299,299,0,0,0,0,0,"[Translate to Dansk:] Regular Element #3",
,301,89,384,0,1,297,297,297,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1",
,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1",
,303,89,416,0,1,0,298,298,0,0,0,0,0,"Regular Element #2 (copy 1)",
"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageWSynchronization.csv
index 760d3a7eaae1c6e96272c0cc19dd54f1daa481fa..a7d2f94e40556714859e8044aadfa33664fe72b6 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyContentToLanguageWSynchronization.csv
@@ -2,13 +2,17 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l10n_source","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","l10n_state"
,296,88,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #0",
,297,89,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #1",
-,298,89,512,0,0,0,0,0,0,0,0,0,0,"Testing #1",\NULL
+,298,89,512,0,0,0,0,0,0,0,0,0,0,"Testing #1","\NULL"
,299,89,768,0,0,0,0,0,0,0,0,0,0,"Regular Element #3",
,300,89,1024,0,1,299,299,299,0,0,0,0,0,"[Translate to Dansk:] Regular Element #3",
,301,89,384,0,1,297,297,297,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1",
,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1",
,303,89,416,0,1,0,298,298,0,0,0,0,0,"[Translate to Dansk:] Regular Element #2",
"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyPage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyPage.csv
index a1c0279239f710d0234eed62274c1e10bec4c0fa..2acd62ac6170e6a91ece428e231ff20ee88d0a9e 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyPage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyPage.csv
@@ -21,7 +21,11 @@
,307,91,16,0,1,306,306,301,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1"
,308,91,8,0,2,306,307,302,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"82d0cf88b8fd9ff00793b2fa533ddbc7","tt_content",304,"l18n_parent",0,0,0,"tt_content",303,,,,,
-,"6533fcc65c25ba66af53b6dbc7b2e716","tt_content",307,"l18n_parent",0,0,0,"tt_content",306,,,,,
-,"70d62e692670e641acf36bbae846ce00","tt_content",308,"l18n_parent",0,0,0,"tt_content",306,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"82d0cf88b8fd9ff00793b2fa533ddbc7","tt_content",304,"l18n_parent",,,,0,0,0,"tt_content",303,,
+,"6533fcc65c25ba66af53b6dbc7b2e716","tt_content",307,"l18n_parent",,,,0,0,0,"tt_content",306,,
+,"70d62e692670e641acf36bbae846ce00","tt_content",308,"l18n_parent",,,,0,0,0,"tt_content",306,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyPageFreeMode.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyPageFreeMode.csv
index 786aebb7632594285dcdc11cc501d249f5cab8a6..473281346c381a2f2067ab80a92a88e688425afb 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyPageFreeMode.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyPageFreeMode.csv
@@ -21,4 +21,8 @@
,314,91,128,0,1,0,315,311,0,0,0,0,0,"[Translate to Dansk:] Regular Element #10"
,315,91,64,0,0,0,0,310,0,0,0,0,0,"Regular Element #10"
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyPasteContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyPasteContent.csv
index 9f2e4e66ecc376c32bbf0a0d25d16481ec4ed5a7..6718cabb173b58030721423a69a2ca26f9aac636 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyPasteContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/copyPasteContent.csv
@@ -9,4 +9,8 @@
,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
,303,89,128,0,0,0,0,298,0,0,0,0,0,"Testing #1"
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContentForLanguageAll.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContentForLanguageAll.csv
index ea9cb4668f277919aecfd26dea9b72d4cbe938ef..5f28bfd0885ea353974f1090a3433196b35dd30c 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContentForLanguageAll.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContentForLanguageAll.csv
@@ -1,16 +1,20 @@
"tt_content",,,,,,,,,,,,,,,
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l10n_source","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","l10n_state"
-,296,88,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #0",\NULL
-,297,89,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #1",\NULL
-,298,89,512,0,0,0,0,0,0,0,0,0,0,"Regular Element #2",\NULL
-,299,89,768,0,0,0,0,0,0,0,0,0,0,"Regular Element #3",\NULL
-,300,89,1024,0,1,299,299,299,0,0,0,0,0,"[Translate to Dansk:] Regular Element #3",\NULL
-,301,89,384,0,1,297,297,297,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1",\NULL
-,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1",\NULL
-,303,89,128,0,-1,0,0,0,0,0,0,0,0,"Language set to all",\NULL
+,296,88,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #0","\NULL"
+,297,89,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #1","\NULL"
+,298,89,512,0,0,0,0,0,0,0,0,0,0,"Regular Element #2","\NULL"
+,299,89,768,0,0,0,0,0,0,0,0,0,0,"Regular Element #3","\NULL"
+,300,89,1024,0,1,299,299,299,0,0,0,0,0,"[Translate to Dansk:] Regular Element #3","\NULL"
+,301,89,384,0,1,297,297,297,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1","\NULL"
+,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1","\NULL"
+,303,89,128,0,-1,0,0,0,0,0,0,0,0,"Language set to all","\NULL"
"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,
-,"595e5e033f510dde7c921d3381b382c4","pages",92,"l10n_parent",0,0,0,"pages",89,,,,,,
-,"d9b676030a71bcc2e059eb713ec3aac0","pages",92,"sys_language_uid",0,0,0,"sys_language",2,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,
+,"595e5e033f510dde7c921d3381b382c4","pages",92,"l10n_parent",,,,0,0,0,"pages",89,,,
+,"d9b676030a71bcc2e059eb713ec3aac0","pages",92,"sys_language_uid",,,,0,0,0,"sys_language",2,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContents.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContents.csv
index 4f4372693d017cf25d0c9b9dab5b9436b03c5057..2c3721c69707788269b22d40a480a212fc1daec6 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContents.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createContents.csv
@@ -10,4 +10,8 @@
,303,89,128,0,0,0,0,0,0,0,0,0,0,"Testing #1"
,304,89,640,0,0,0,0,0,0,0,0,0,0,"Testing #2"
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createLocalizedContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createLocalizedContent.csv
index 935094df0b20f209cb4af4f3ba291873eaed8abe..5f8758c3f5183e5229007876d07c9dcf8c6cf02f 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createLocalizedContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createLocalizedContent.csv
@@ -7,10 +7,14 @@
,300,89,1024,0,1,299,299,299,0,0,0,0,0,"[Translate to Dansk:] Regular Element #3",
,301,89,384,0,1,297,297,297,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1",
,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1",
-,303,89,128,0,0,0,0,0,0,0,0,0,0,"Testing",\NULL
-,304,89,64,0,1,303,303,0,0,0,0,0,0,"Localized Testing",\NULL
+,303,89,128,0,0,0,0,0,0,0,0,0,0,"Testing","\NULL"
+,304,89,64,0,1,303,303,0,0,0,0,0,0,"Localized Testing","\NULL"
"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,
-,"82d0cf88b8fd9ff00793b2fa533ddbc7","tt_content",304,"l18n_parent",0,0,0,"tt_content",303,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,
+,"82d0cf88b8fd9ff00793b2fa533ddbc7","tt_content",304,"l18n_parent",,,,0,0,0,"tt_content",303,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createLocalizedContentWExclude.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createLocalizedContentWExclude.csv
index a45cbb4e8c93422cd4e71868d3bb61f8886edef8..8b4dc4d6f963194914b805c000d79c074af960a2 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createLocalizedContentWExclude.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createLocalizedContentWExclude.csv
@@ -7,10 +7,14 @@
,300,89,1024,0,1,299,299,299,0,0,0,0,0,"[Translate to Dansk:] Regular Element #3",
,301,89,384,0,1,297,297,297,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1",
,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1",
-,303,89,128,0,0,0,0,0,0,0,0,0,0,"Testing",\NULL
-,304,89,64,0,1,303,303,0,0,0,0,0,0,"Testing",\NULL
+,303,89,128,0,0,0,0,0,0,0,0,0,0,"Testing","\NULL"
+,304,89,64,0,1,303,303,0,0,0,0,0,0,"Testing","\NULL"
"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,
-,"82d0cf88b8fd9ff00793b2fa533ddbc7","tt_content",304,"l18n_parent",0,0,0,"tt_content",303,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,
+,"82d0cf88b8fd9ff00793b2fa533ddbc7","tt_content",304,"l18n_parent",,,,0,0,0,"tt_content",303,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createLocalizedContentWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createLocalizedContentWSynchronization.csv
index 3c0e73819a73763b7239695dd1a37dad0196fdb6..5810ee7a165d25b4ac09aab1dd0e107267008a40 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createLocalizedContentWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createLocalizedContentWSynchronization.csv
@@ -7,10 +7,14 @@
,300,89,1024,0,1,299,299,299,0,0,0,0,0,"[Translate to Dansk:] Regular Element #3",
,301,89,384,0,1,297,297,297,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1",
,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1",
-,303,89,128,0,0,0,0,0,0,0,0,0,0,"Testing",\NULL
+,303,89,128,0,0,0,0,0,0,0,0,0,0,"Testing","\NULL"
,304,89,64,0,1,303,303,0,0,0,0,0,0,"Testing","{""header"":""parent""}"
"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,
-,"82d0cf88b8fd9ff00793b2fa533ddbc7","tt_content",304,"l18n_parent",0,0,0,"tt_content",303,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,
+,"82d0cf88b8fd9ff00793b2fa533ddbc7","tt_content",304,"l18n_parent",,,,0,0,0,"tt_content",303,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPage.csv
index 1dc3574f095cd48edeadfc18b866a276b5b7c155..da6b2caa6ef072181cb6dab7fc62f54b35e20858 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPage.csv
@@ -1,9 +1,13 @@
-"pages",,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","slug"
-,1,0,256,0,0,0,0,0,0,0,"FunctionalTest","/"
-,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest","/data-handler"
-,89,88,256,0,0,0,0,0,0,0,"Relations","/data-handler/relations"
-,90,88,512,0,0,0,0,0,0,0,"Target","/data-handler/target"
-,91,89,256,0,0,0,0,0,0,0,"Testing #1","/data-handler/relations/testing-1"
-"sys_refindex",,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,
+"pages",,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","slug",
+,1,0,256,0,0,0,0,0,0,0,"FunctionalTest","/",
+,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest","/data-handler",
+,89,88,256,0,0,0,0,0,0,0,"Relations","/data-handler/relations",
+,90,88,512,0,0,0,0,0,0,0,"Target","/data-handler/target",
+,91,89,256,0,0,0,0,0,0,0,"Testing #1","/data-handler/relations/testing-1",
+"sys_refindex",,,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string"
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPageAndSubPageAndSubPageContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPageAndSubPageAndSubPageContent.csv
index c2e66c6632a25652587b6b6b6b040f7731085069..8f8e6cce479711a3e3243060a0a76c86e218f63f 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPageAndSubPageAndSubPageContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPageAndSubPageAndSubPageContent.csv
@@ -17,4 +17,8 @@
,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
,303,92,256,0,0,0,0,0,0,0,0,0,0,"Testing #1 #1"
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPageNContentWDefaults.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPageNContentWDefaults.csv
index 9872c230a1a249d7068b543b98b01f8590bd5cb5..6f27ab8d47c5910b30a499cc45ea413f49218ddc 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPageNContentWDefaults.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPageNContentWDefaults.csv
@@ -15,3 +15,9 @@
,301,89,384,0,0,1,297,297,297,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1"
,302,89,448,0,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
,303,91,256,0,0,0,0,0,0,0,0,0,0,0,"Testing #1"
+"sys_refindex",,,,,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPageWithSlugOverrideConfiguration.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPageWithSlugOverrideConfiguration.csv
index 9f3526ead67f6ff6f00b60886ca42c4e4632487e..48c154cf35a0a900eed1af486c678068282fbd9f 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPageWithSlugOverrideConfiguration.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/createPageWithSlugOverrideConfiguration.csv
@@ -1,9 +1,13 @@
-"pages",,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","slug"
-,1,0,256,0,0,0,0,0,0,0,"FunctionalTest","/"
-,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest","/data-handler"
-,89,88,256,0,0,0,0,0,0,0,"Relations","/data-handler/relations"
-,90,88,512,0,0,0,0,0,0,0,"Target","/data-handler/target"
-,91,89,256,0,0,0,0,0,0,0,"Testing #1","/data-handler/relations/nav-testing-1"
-"sys_refindex",,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,
+"pages",,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","slug",
+,1,0,256,0,0,0,0,0,0,0,"FunctionalTest","/",
+,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest","/data-handler",
+,89,88,256,0,0,0,0,0,0,0,"Relations","/data-handler/relations",
+,90,88,512,0,0,0,0,0,0,0,"Target","/data-handler/target",
+,91,89,256,0,0,0,0,0,0,0,"Testing #1","/data-handler/relations/nav-testing-1",
+"sys_refindex",,,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string"
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteContent.csv
index b2a83bb33b764ae5c755d975051145b7b746f10b..8d356dc416c8733927ca13b3d89131ed489bc7de 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteContent.csv
@@ -8,4 +8,8 @@
,301,89,384,0,1,297,297,297,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1"
,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteLocalizedContentNDeleteContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteLocalizedContentNDeleteContent.csv
index 1d3e55a19d1ffd7447729fd05365381ead04c7fb..482e83bfafbe7fc47bf53fc79f2b1fa275bae385 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteLocalizedContentNDeleteContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/deleteLocalizedContentNDeleteContent.csv
@@ -8,7 +8,10 @@
,301,89,384,0,1,297,297,297,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1"
,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"129f6a7f7dec4293b757c375e7dd7078","tt_content",300,"l18n_parent",0,1,0,"tt_content",299,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"129f6a7f7dec4293b757c375e7dd7078","tt_content",300,"l18n_parent",,,,0,1,0,"tt_content",299,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/deletePage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/deletePage.csv
index 3a7dfae4ab25e993bb6c63ec27d0322465369c87..f032a3b37ef4037793aa2700a2dd53ad782a8c29 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/deletePage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/deletePage.csv
@@ -14,7 +14,8 @@
,301,89,384,1,1,297,297,297,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1"
,302,89,448,1,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"083dd2fbf54e1d7279eb503359be31c8","tt_content",301,"l18n_parent",0,1,0,"tt_content",297,,,,,
-,"3d925d0a2a0939984e72ed3b10fd886f","tt_content",302,"l18n_parent",0,1,0,"tt_content",297,,,,,
-,"129f6a7f7dec4293b757c375e7dd7078","tt_content",300,"l18n_parent",0,1,0,"tt_content",299,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,
+,"083dd2fbf54e1d7279eb503359be31c8","tt_content",301,"l18n_parent",,,,0,1,0,"tt_content",297,,
+,"3d925d0a2a0939984e72ed3b10fd886f","tt_content",302,"l18n_parent",,,,0,1,0,"tt_content",297,,
+,"129f6a7f7dec4293b757c375e7dd7078","tt_content",300,"l18n_parent",,,,0,1,0,"tt_content",299,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContent.csv
index 77d5bc8cbaa26d866dff1b0dca88d5f33e7178e1..bf27bfa00ff28694072c51682f6a61e1a3799998 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContent.csv
@@ -9,7 +9,11 @@
,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
,303,89,416,0,1,298,298,298,0,0,0,0,0,"[Translate to Dansk:] Regular Element #2"
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"15671609261d8dad298130ec20f2bf3f","tt_content",303,"l18n_parent",0,0,0,"tt_content",298,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"15671609261d8dad298130ec20f2bf3f","tt_content",303,"l18n_parent",,,,0,0,0,"tt_content",298,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguage.csv
index 1a8dd61bebc2fbfe6083372431fcf52762f39298..7bebacfeee0ba9a282b4e2570e1211e2bd2537a4 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguage.csv
@@ -9,9 +9,13 @@
,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
,303,89,1280,0,2,299,300,300,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #3"
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"595e5e033f510dde7c921d3381b382c4","pages",92,"l10n_parent",0,0,0,"pages",89,,,,,
-,"d9b676030a71bcc2e059eb713ec3aac0","pages",92,"sys_language_uid",0,0,0,"sys_language",2,,,,,
-,"caa82d73675dfb074a79d429d9999481","tt_content",303,"l18n_parent",0,0,0,"tt_content",299,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"595e5e033f510dde7c921d3381b382c4","pages",92,"l10n_parent",,,,0,0,0,"pages",89,,
+,"d9b676030a71bcc2e059eb713ec3aac0","pages",92,"sys_language_uid",,,,0,0,0,"sys_language",2,,
+,"caa82d73675dfb074a79d429d9999481","tt_content",303,"l18n_parent",,,,0,0,0,"tt_content",299,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguageWSynchronizationDefault.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguageWSynchronizationDefault.csv
index 79b7df208aa60f5467322d886fc11d8a37b196ec..3c23711babd13e16310d3573242a65edbc2307da 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguageWSynchronizationDefault.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguageWSynchronizationDefault.csv
@@ -9,10 +9,13 @@
,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1",
,303,89,1280,0,2,299,300,300,0,0,0,0,0,"Testing #1","{""header"":""parent""}"
"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,
-,"595e5e033f510dde7c921d3381b382c4","pages",92,"l10n_parent",0,0,0,"pages",89,,,,,,
-,"d9b676030a71bcc2e059eb713ec3aac0","pages",92,"sys_language_uid",0,0,0,"sys_language",2,,,,,,
-,"caa82d73675dfb074a79d429d9999481","tt_content",303,"l18n_parent",0,0,0,"tt_content",299,,,,,,
-,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",0,0,0,"tt_content",299,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,
+,"595e5e033f510dde7c921d3381b382c4","pages",92,"l10n_parent",,,,0,0,0,"pages",89,,,
+,"d9b676030a71bcc2e059eb713ec3aac0","pages",92,"sys_language_uid",,,,0,0,0,"sys_language",2,,,
+,"caa82d73675dfb074a79d429d9999481","tt_content",303,"l18n_parent",,,,0,0,0,"tt_content",299,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguageWSynchronizationSource.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguageWSynchronizationSource.csv
index f59048e83c59029c659de5ead9292f8b0ab781fe..fb5e78243fc71dd5372fbafcd2f52c3a19baaa35 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguageWSynchronizationSource.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentFromNonDefaultLanguageWSynchronizationSource.csv
@@ -9,10 +9,13 @@
,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1",
,303,89,1280,0,2,299,300,300,0,0,0,0,0,"Testing #1","{""header"":""source""}"
"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,
-,"595e5e033f510dde7c921d3381b382c4","pages",92,"l10n_parent",0,0,0,"pages",89,,,,,,
-,"d9b676030a71bcc2e059eb713ec3aac0","pages",92,"sys_language_uid",0,0,0,"sys_language",2,,,,,,
-,"caa82d73675dfb074a79d429d9999481","tt_content",303,"l18n_parent",0,0,0,"tt_content",299,,,,,,
-,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",0,0,0,"tt_content",299,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,
+,"595e5e033f510dde7c921d3381b382c4","pages",92,"l10n_parent",,,,0,0,0,"pages",89,,,
+,"d9b676030a71bcc2e059eb713ec3aac0","pages",92,"sys_language_uid",,,,0,0,0,"sys_language",2,,,
+,"caa82d73675dfb074a79d429d9999481","tt_content",303,"l18n_parent",,,,0,0,0,"tt_content",299,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWSynchronization.csv
index 3de51470fe5bac61d70e8229f7114c4d8daa648c..104edf5d3488eb9154d55f091534c48b050c10dd 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWSynchronization.csv
@@ -2,14 +2,18 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l10n_source","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","l10n_state"
,296,88,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #0",
,297,89,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #1",
-,298,89,512,0,0,0,0,0,0,0,0,0,0,"Testing #1",\NULL
+,298,89,512,0,0,0,0,0,0,0,0,0,0,"Testing #1","\NULL"
,299,89,768,0,0,0,0,0,0,0,0,0,0,"Regular Element #3",
,300,89,1024,0,1,299,299,299,0,0,0,0,0,"[Translate to Dansk:] Regular Element #3",
,301,89,384,0,1,297,297,297,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1",
,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1",
,303,89,416,0,1,298,298,298,0,0,0,0,0,"Testing #1","{""header"":""parent""}"
"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,
-,"15671609261d8dad298130ec20f2bf3f","tt_content",303,"l18n_parent",0,0,0,"tt_content",298,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,
+,"15671609261d8dad298130ec20f2bf3f","tt_content",303,"l18n_parent",,,,0,0,0,"tt_content",298,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWSynchronizationHNull.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWSynchronizationHNull.csv
index 2c5352a3acc24fced41c487693e7547758aeb54b..6d02ef44efc0a3f42cefe8aac097e5fd7e25d2fa 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWSynchronizationHNull.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWSynchronizationHNull.csv
@@ -2,14 +2,18 @@
,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l10n_source","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","bodytext","l10n_state"
,296,88,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #0",,
,297,89,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #1",,
-,298,89,512,0,0,0,0,0,0,0,0,0,0,"Testing #1",\NULL,\NULL
+,298,89,512,0,0,0,0,0,0,0,0,0,0,"Testing #1","\NULL","\NULL"
,299,89,768,0,0,0,0,0,0,0,0,0,0,"Regular Element #3",,
,300,89,1024,0,1,299,299,299,0,0,0,0,0,"[Translate to Dansk:] Regular Element #3",,
,301,89,384,0,1,297,297,297,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1",,
,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1",,
-,303,89,416,0,1,298,298,298,0,0,0,0,0,"Testing #1",\NULL,"{""header"":""parent"",""bodytext"":""parent""}"
+,303,89,416,0,1,298,298,298,0,0,0,0,0,"Testing #1","\NULL","{""header"":""parent"",""bodytext"":""parent""}"
"sys_refindex",,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,,
-,"15671609261d8dad298130ec20f2bf3f","tt_content",303,"l18n_parent",0,0,0,"tt_content",298,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,
+,"15671609261d8dad298130ec20f2bf3f","tt_content",303,"l18n_parent",,,,0,0,0,"tt_content",298,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWithEmptyTcaIntegrityColumns.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWithEmptyTcaIntegrityColumns.csv
index f04d40819d5f6741f9821116956b672f4ded4fbf..399bf9fef8f5497692630c3a516dac727fac6ac1 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWithEmptyTcaIntegrityColumns.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeContentWithEmptyTcaIntegrityColumns.csv
@@ -9,6 +9,10 @@
,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
,303,89,416,0,1,298,298,298,0,0,0,0,0,"[Translate to Dansk:] Regular Element #2"
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeNCopyPage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeNCopyPage.csv
index 0784287a4277d85bc83a15643e799724b62a0b76..b2e5f489b270622b260b66e3471519ae2fae2e4d 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeNCopyPage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeNCopyPage.csv
@@ -23,11 +23,15 @@
,307,92,16,0,1,306,306,301,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1"
,308,92,8,0,2,306,307,302,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"d0bc06b71f765fd230f63a9dc847c7fe","pages",93,"l10n_parent",0,0,0,"pages",92,,,,,
-,"2376b105383bdfe30bf66df5d704a7be","pages",93,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"82d0cf88b8fd9ff00793b2fa533ddbc7","tt_content",304,"l18n_parent",0,0,0,"tt_content",303,,,,,
-,"6533fcc65c25ba66af53b6dbc7b2e716","tt_content",307,"l18n_parent",0,0,0,"tt_content",306,,,,,
-,"70d62e692670e641acf36bbae846ce00","tt_content",308,"l18n_parent",0,0,0,"tt_content",306,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"d0bc06b71f765fd230f63a9dc847c7fe","pages",93,"l10n_parent",,,,0,0,0,"pages",92,,
+,"2376b105383bdfe30bf66df5d704a7be","pages",93,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"82d0cf88b8fd9ff00793b2fa533ddbc7","tt_content",304,"l18n_parent",,,,0,0,0,"tt_content",303,,
+,"6533fcc65c25ba66af53b6dbc7b2e716","tt_content",307,"l18n_parent",,,,0,0,0,"tt_content",306,,
+,"70d62e692670e641acf36bbae846ce00","tt_content",308,"l18n_parent",,,,0,0,0,"tt_content",306,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeNCopyPageWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeNCopyPageWSynchronization.csv
index 68b1c85317004fd1167226319899db8a2a810996..3b8da7bd5153274b45ce769f0c0bdb537738269f 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeNCopyPageWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeNCopyPageWSynchronization.csv
@@ -1,33 +1,37 @@
-"pages",,,,,,,,,,,,,,,
-,"uid","pid","sorting","sys_language_uid","l10n_parent","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","slug","l10n_state"
-,1,0,256,0,0,0,0,0,0,0,0,0,"FunctionalTest","/",
-,88,1,256,0,0,0,0,0,0,0,0,0,"DataHandlerTest","/data-handler",
-,89,88,256,0,0,0,0,0,0,0,0,0,"Testing #1","/data-handler/relations",
-,90,88,512,0,0,0,0,0,0,0,0,0,"Target","/data-handler/target",
-,91,88,256,1,89,0,0,0,0,0,0,0,"Testing #1","/data-handler/relations","{""title"":""parent"",""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent""}"
-,92,90,256,0,0,0,89,0,0,0,0,0,"Testing #1","/data-handler/relations-1",
-,93,90,256,1,92,0,91,0,0,0,0,0,"Testing #1","/data-handler/relations-1","{""title"":""parent"",""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent""}"
-"tt_content",,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l10n_source","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header",
-,296,88,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #0",
-,297,89,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #1",
-,298,89,512,0,0,0,0,0,0,0,0,0,0,"Regular Element #2",
-,299,89,768,0,0,0,0,0,0,0,0,0,0,"Regular Element #3",
-,300,89,1024,0,1,299,299,299,0,0,0,0,0,"[Translate to Dansk:] Regular Element #3",
-,301,89,384,0,1,297,297,297,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1",
-,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1",
-,303,92,256,0,0,0,0,299,0,0,0,0,0,"Regular Element #3",
-,304,92,128,0,1,303,303,300,0,0,0,0,0,"[Translate to Dansk:] Regular Element #3",
-,305,92,64,0,0,0,0,298,0,0,0,0,0,"Regular Element #2",
-,306,92,32,0,0,0,0,297,0,0,0,0,0,"Regular Element #1",
-,307,92,16,0,1,306,306,301,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1",
-,308,92,8,0,2,306,307,302,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1",
-"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,
-,"d0bc06b71f765fd230f63a9dc847c7fe","pages",93,"l10n_parent",0,0,0,"pages",92,,,,,,
-,"2376b105383bdfe30bf66df5d704a7be","pages",93,"sys_language_uid",0,0,0,"sys_language",1,,,,,,
-,"82d0cf88b8fd9ff00793b2fa533ddbc7","tt_content",304,"l18n_parent",0,0,0,"tt_content",303,,,,,,
-,"6533fcc65c25ba66af53b6dbc7b2e716","tt_content",307,"l18n_parent",0,0,0,"tt_content",306,,,,,,
-,"70d62e692670e641acf36bbae846ce00","tt_content",308,"l18n_parent",0,0,0,"tt_content",306,,,,,,
+"pages",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","sys_language_uid","l10n_parent","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","slug","l10n_state",,,,,,,,,,,,,
+,1,0,256,0,0,0,0,0,0,0,0,0,"FunctionalTest","/",,,,,,,,,,,,,,
+,88,1,256,0,0,0,0,0,0,0,0,0,"DataHandlerTest","/data-handler",,,,,,,,,,,,,,
+,89,88,256,0,0,0,0,0,0,0,0,0,"Testing #1","/data-handler/relations",,,,,,,,,,,,,,
+,90,88,512,0,0,0,0,0,0,0,0,0,"Target","/data-handler/target",,,,,,,,,,,,,,
+,91,88,256,1,89,0,0,0,0,0,0,0,"Testing #1","/data-handler/relations","{""title"":""parent"",""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent""}",,,,,,,,,,,,,
+,92,90,256,0,0,0,89,0,0,0,0,0,"Testing #1","/data-handler/relations-1",,,,,,,,,,,,,,
+,93,90,256,1,92,0,91,0,0,0,0,0,"Testing #1","/data-handler/relations-1","{""title"":""parent"",""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent""}",,,,,,,,,,,,,
+"tt_content",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l10n_source","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header",,,,,,,,,,,,,,
+,296,88,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #0",,,,,,,,,,,,,,
+,297,89,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #1",,,,,,,,,,,,,,
+,298,89,512,0,0,0,0,0,0,0,0,0,0,"Regular Element #2",,,,,,,,,,,,,,
+,299,89,768,0,0,0,0,0,0,0,0,0,0,"Regular Element #3",,,,,,,,,,,,,,
+,300,89,1024,0,1,299,299,299,0,0,0,0,0,"[Translate to Dansk:] Regular Element #3",,,,,,,,,,,,,,
+,301,89,384,0,1,297,297,297,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1",,,,,,,,,,,,,,
+,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1",,,,,,,,,,,,,,
+,303,92,256,0,0,0,0,299,0,0,0,0,0,"Regular Element #3",,,,,,,,,,,,,,
+,304,92,128,0,1,303,303,300,0,0,0,0,0,"[Translate to Dansk:] Regular Element #3",,,,,,,,,,,,,,
+,305,92,64,0,0,0,0,298,0,0,0,0,0,"Regular Element #2",,,,,,,,,,,,,,
+,306,92,32,0,0,0,0,297,0,0,0,0,0,"Regular Element #1",,,,,,,,,,,,,,
+,307,92,16,0,1,306,306,301,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1",,,,,,,,,,,,,,
+,308,92,8,0,2,306,307,302,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1",,,,,,,,,,,,,,
+"sys_refindex",,,,,,,,,,,,,,,,,,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,,,,,,,,,,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,,,,,,,,,,,,,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,,,,,,,,,,,,,,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,,,,,,,,,,,,,,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,,,,,,,,,,,,,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,,,,,,,,,,,,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,,,,,,,,,,,
+,"d0bc06b71f765fd230f63a9dc847c7fe","pages",93,"l10n_parent",,,,0,0,0,"pages",92,,,,,,,,,,,,,,,,
+,"2376b105383bdfe30bf66df5d704a7be","pages",93,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,,,,,,,,,,,,
+,"82d0cf88b8fd9ff00793b2fa533ddbc7","tt_content",304,"l18n_parent",,,,0,0,0,"tt_content",303,,,,,,,,,,,,,,,,
+,"6533fcc65c25ba66af53b6dbc7b2e716","tt_content",307,"l18n_parent",,,,0,0,0,"tt_content",306,,,,,,,,,,,,,,,,
+,"70d62e692670e641acf36bbae846ce00","tt_content",308,"l18n_parent",,,,0,0,0,"tt_content",306,,,,,,,,,,,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeNestedPagesAndContents.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeNestedPagesAndContents.csv
index 2729650889263dafc9751e50fd553dee64c2f81e..cdd4af2b917e94d36c68ddc0ed1706b46ccea680 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeNestedPagesAndContents.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizeNestedPagesAndContents.csv
@@ -20,11 +20,15 @@
,305,88,128,0,0,0,0,296,0,0,0,0,0,"Regular Element #0 (copy 1)",
,306,88,64,0,1,305,305,303,0,0,0,0,0,"[Translate to Dansk:] Regular Element #0 (copy 1)",
"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
-,"7b1c9e846ad6a9df0ee32d5b7cf00074","pages",91,"l10n_parent",0,0,0,"pages",88,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,
-,"803e1de6d7ebf5058ed3954c0c5743f9","tt_content",303,"l18n_parent",0,0,0,"tt_content",296,,,,,,
-,"595e5e033f510dde7c921d3381b382c4","pages",92,"l10n_parent",0,0,0,"pages",89,,,,,,
-,"1438832cf7faeb89558ad2c5b329ce58","pages",92,"sys_language_uid",0,0,0,"sys_language",1,,,,,,
-,"c2c0cdd8851ad8d180770ec1c31e28dd","tt_content",304,"l18n_parent",0,0,0,"tt_content",298,,,,,,
-,"864b80d281b54aa351a893cafcbdf611","tt_content",306,"l18n_parent",0,0,0,"tt_content",305,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,,
+,"7b1c9e846ad6a9df0ee32d5b7cf00074","pages",91,"l10n_parent",,,,0,0,0,"pages",88,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,
+,"803e1de6d7ebf5058ed3954c0c5743f9","tt_content",303,"l18n_parent",,,,0,0,0,"tt_content",296,,,
+,"595e5e033f510dde7c921d3381b382c4","pages",92,"l10n_parent",,,,0,0,0,"pages",89,,,
+,"1438832cf7faeb89558ad2c5b329ce58","pages",92,"sys_language_uid",,,,0,0,0,"sys_language",1,,,
+,"c2c0cdd8851ad8d180770ec1c31e28dd","tt_content",304,"l18n_parent",,,,0,0,0,"tt_content",298,,,
+,"864b80d281b54aa351a893cafcbdf611","tt_content",306,"l18n_parent",,,,0,0,0,"tt_content",305,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePage.csv
index 92a9e0ddb63bc473bc7f077b011a747b929771f9..03ab8a00f0c6c9901bab64960363baf7265a3639 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePage.csv
@@ -15,6 +15,10 @@
,301,89,384,0,1,297,297,297,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1",
,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1",
"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePageAndContentsAndDeletePageLocalization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePageAndContentsAndDeletePageLocalization.csv
index edf16b72f47e4f9df331502eb5bef44effeaa344..9a9267d7398107abdfe3b00a1fa0b41a372279b9 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePageAndContentsAndDeletePageLocalization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePageAndContentsAndDeletePageLocalization.csv
@@ -16,9 +16,11 @@
,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1",
,303,89,416,1,1,298,298,298,0,0,0,0,0,"[Translate to Dansk:] Regular Element #2",
"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
-,"083dd2fbf54e1d7279eb503359be31c8","tt_content",301,"l18n_parent",0,1,0,"tt_content",297,,,,,,
-,"b631caa4ff71018134b35003f71d5b2a","tt_content",303,"l18n_parent",0,1,0,"tt_content",298,,,,,,
-,"129f6a7f7dec4293b757c375e7dd7078","tt_content",300,"l18n_parent",0,1,0,"tt_content",299,,,,,,
-,"62a00f836c52647adea596b5446fc521","pages",91,"l10n_parent",0,1,0,"pages",89,,,,,,
-,"278902ae7d6269b1930be716e5adb8a4","pages",91,"sys_language_uid",0,1,0,"sys_language",1,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,,
+,"083dd2fbf54e1d7279eb503359be31c8","tt_content",301,"l18n_parent",,,,0,1,0,"tt_content",297,,,
+,"b631caa4ff71018134b35003f71d5b2a","tt_content",303,"l18n_parent",,,,0,1,0,"tt_content",298,,,
+,"129f6a7f7dec4293b757c375e7dd7078","tt_content",300,"l18n_parent",,,,0,1,0,"tt_content",299,,,
+,"62a00f836c52647adea596b5446fc521","pages",91,"l10n_parent",,,,0,1,0,"pages",89,,,
+,"278902ae7d6269b1930be716e5adb8a4","pages",91,"sys_language_uid",,,,0,1,0,"sys_language",1,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePageWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePageWSynchronization.csv
index b52c5b9522e80bdddcdfffe7f52da6895b2d0b37..74262c7b94e6a8d20d9d701285ff5dbf6d78cff6 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePageWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/localizePageWSynchronization.csv
@@ -15,6 +15,10 @@
,301,89,384,0,1,297,297,297,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1"
,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/modifyContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/modifyContent.csv
index 9e0b9a1b013f236a830b9e1989406735cec8f5b5..3fbefaa4bc9687593e44ffa3c5c80cee43cd5bf9 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/modifyContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/modifyContent.csv
@@ -8,4 +8,8 @@
,301,89,384,0,1,297,297,297,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1"
,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/modifyPage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/modifyPage.csv
index 450acdd1a1ee2ce60627439d6f4df37475675f47..275f427c6b218cabc98b5e873a11471e93f89882 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/modifyPage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/modifyPage.csv
@@ -1,8 +1,12 @@
-"pages",,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","slug"
-,1,0,256,0,0,0,0,0,0,0,"FunctionalTest","/"
-,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest","/data-handler"
-,89,88,256,0,0,0,0,0,0,0,"Testing #1","/data-handler/relations"
-,90,88,512,0,0,0,0,0,0,0,"Target","/data-handler/target"
-"sys_refindex",,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,
+"pages",,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","slug",
+,1,0,256,0,0,0,0,0,0,0,"FunctionalTest","/",
+,88,1,256,0,0,0,0,0,0,0,"DataHandlerTest","/data-handler",
+,89,88,256,0,0,0,0,0,0,0,"Testing #1","/data-handler/relations",
+,90,88,512,0,0,0,0,0,0,0,"Target","/data-handler/target",
+"sys_refindex",,,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string"
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/modifyTranslatedContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/modifyTranslatedContent.csv
index a1cf3f64719bc0ab0dfe34f142f474a5313b3ca1..280b7edd57a2ca560de9c2c8f301a55a5ce66467 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/modifyTranslatedContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/modifyTranslatedContent.csv
@@ -1,14 +1,17 @@
-"tt_content",,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l10n_source","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","l18n_diffsource"
-,296,88,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #0",
-,297,89,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #1",
-,298,89,512,0,0,0,0,0,0,0,0,0,0,"Regular Element #2",
-,299,89,768,0,0,0,0,0,0,0,0,0,0,"Regular Element #3",
-,300,89,1024,0,1,299,299,299,0,0,0,0,0,"Testing Translation #3","{""header"":""Regular Element #3"",""starttime"":""0"",""endtime"":""0""}"
-,301,89,384,0,1,297,297,297,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1",
-,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1",
-"sys_refindex",,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,,
-,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",0,0,0,"tt_content",299,,,,,,
+"tt_content",,,,,,,,,,,,,,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l10n_source","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","l18n_diffsource",,
+,296,88,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #0",,,
+,297,89,256,0,0,0,0,0,0,0,0,0,0,"Regular Element #1",,,
+,298,89,512,0,0,0,0,0,0,0,0,0,0,"Regular Element #2",,,
+,299,89,768,0,0,0,0,0,0,0,0,0,0,"Regular Element #3",,,
+,300,89,1024,0,1,299,299,299,0,0,0,0,0,"Testing Translation #3","{""header"":""Regular Element #3"",""starttime"":""0"",""endtime"":""0""}",,
+,301,89,384,0,1,297,297,297,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1",,,
+,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1",,,
+"sys_refindex",,,,,,,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",,,,
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,,,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,,,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,,,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,,,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/moveContentToDifferentPage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/moveContentToDifferentPage.csv
index 64a0a2ae666ae7c4c90428885b3a5b06d621a3ac..566cfe85da8b84959335b11b68f43626a1763a8f 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/moveContentToDifferentPage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/moveContentToDifferentPage.csv
@@ -8,4 +8,8 @@
,301,89,384,0,1,297,297,297,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1"
,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/moveContentToDifferentPageNChangeSorting.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/moveContentToDifferentPageNChangeSorting.csv
index db731d7576c5379ab492bc27e5fa15b9015af0b7..7c72a4d15b15dc3fcbbbc2c71b473abb2aa6d318 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/moveContentToDifferentPageNChangeSorting.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/moveContentToDifferentPageNChangeSorting.csv
@@ -8,4 +8,8 @@
,301,90,128,0,1,297,297,297,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1"
,302,90,64,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageToDifferentPage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageToDifferentPage.csv
index aa7894e09893c87f126869b6d8c70e55a783761f..462de0709949c0e6dcd5dc2b3da31eae36d61bbf 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageToDifferentPage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageToDifferentPage.csv
@@ -14,4 +14,8 @@
,301,89,384,0,1,297,297,297,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1"
,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageToDifferentPageNChangeSorting.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageToDifferentPageNChangeSorting.csv
index 06a6dc3ff5775a78ca2232a7564d8cfe53e6c7f4..333e0d9b36d7222759d392031f8d969e9c76e08f 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageToDifferentPageNChangeSorting.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePageToDifferentPageNChangeSorting.csv
@@ -14,4 +14,8 @@
,301,89,384,0,1,297,297,297,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1"
,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePasteContentToDifferentPage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePasteContentToDifferentPage.csv
index b22ae2538e6e874f7c0a4d436d4f6328f5bc1bc1..4eae9e2715c405135c3f5dcad13d2692a24fbd3b 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePasteContentToDifferentPage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/DataSet/movePasteContentToDifferentPage.csv
@@ -8,4 +8,8 @@
,301,89,384,0,1,297,297,297,0,0,0,0,0,"[Translate to Dansk:] Regular Element #1"
,302,89,448,0,2,297,301,301,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #1"
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"8765176f1ce58edcb5efdcabd59ca123","sys_category",31,"parent",,,,0,0,0,"sys_category",28,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,0,"tt_content",299,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,0,"tt_content",297,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,0,"tt_content",297,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Select/AbstractActionTestCase.php b/typo3/sysext/core/Tests/Functional/DataHandling/Select/AbstractActionTestCase.php
index b81f010de93459773a8574212fad96875115ffe4..5a3e162b9089d2150145d0717b37a3e440c8160a 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Select/AbstractActionTestCase.php
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Select/AbstractActionTestCase.php
@@ -48,7 +48,6 @@ abstract class AbstractActionTestCase extends AbstractDataHandlerActionTestCase
parent::setUp();
$this->importScenarioDataSet('LiveDefaultPages');
$this->importScenarioDataSet('LiveDefaultElements');
- $this->importScenarioDataSet('ReferenceIndex');
$this->setUpFrontendSite(1, $this->siteLanguageConfiguration);
$this->setUpFrontendRootPage(1, ['typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.typoscript']);
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Select/DataSet/LiveDefaultElements.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Select/DataSet/LiveDefaultElements.csv
index 70029e751eb7e8d7f2de3fc0ccf1829328df3335..c4898f1800e8677d3c663df401e688949d8acff9 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Select/DataSet/LiveDefaultElements.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Select/DataSet/LiveDefaultElements.csv
@@ -11,3 +11,9 @@
,1,89,256,0,0,0,0,0,0,0,0,0,"Element #1",
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
+"sys_refindex",,,,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"1d5f3ff5e2c46e921da27c6379578cbb","tt_content",297,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"e17fe872ae38f0fbce0763d3c54b3af3","tt_content",297,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"85b4354bfb83d5205f4cbf53c6634e2c","tt_content",298,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"0f2f6a320a96b9c7971a6c3984d939c2","tt_content",298,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",3,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Select/DataSet/ReferenceIndex.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Select/DataSet/ReferenceIndex.csv
deleted file mode 100644
index a2359e8738c309319b896c6ed58cf9f86eb78ed0..0000000000000000000000000000000000000000
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Select/DataSet/ReferenceIndex.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-"sys_refindex",,,,,,,,,,,,
-,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","ref_table","ref_uid","ref_string"
-# @todo: The hash fields of next 2 rows are probably wrong
-,"d7065184b2d510f3fada875169bc8c57","tt_content",297,"tx_testdatahandler_select",,,,0,0,"tx_testdatahandler_element",1,
-,"d333521843e8774369e112581bd4643b","tt_content",297,"tx_testdatahandler_select",,,,1,0,"tx_testdatahandler_element",2,
-,"fb9a4c46d91b175ee7503de71523c849","tt_content",298,"tx_testdatahandler_select",,,,0,0,"tx_testdatahandler_element",2,
-,"f54bf3a4ddc51685c0586b31015312cb","tt_content",298,"tx_testdatahandler_select",,,,1,0,"tx_testdatahandler_element",3,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/ActionTest.php b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/ActionTest.php
index 0c6cd84256ee6f89f1af1c1a4b6c6cb110ec333f..c054b2419cb73d1857081ad1d5e8e398ad5ece28 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/ActionTest.php
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/ActionTest.php
@@ -28,8 +28,13 @@ class ActionTest extends AbstractActionTestCase
protected $assertionDataSetDirectory = 'typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/';
/**
- * Relations
+ * @test
*/
+ public function verifyCleanReferenceIndex()
+ {
+ // The test verifies the imported data set has a clean reference index by the check in tearDown()
+ self::assertTrue(true);
+ }
/**
* @test
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/addElementRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/addElementRelation.csv
index b8edea656fcac58059545e2255d08f11b98dc9cb..b2c7f46b565dab3914aa8786856719e443a54c68 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/addElementRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/addElementRelation.csv
@@ -14,9 +14,9 @@
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"fb9a4c46d91b175ee7503de71523c849","tt_content",298,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"f54bf3a4ddc51685c0586b31015312cb","tt_content",298,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",3,,,,,
-,"1d5f3ff5e2c46e921da27c6379578cbb","tt_content",297,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"e17fe872ae38f0fbce0763d3c54b3af3","tt_content",297,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",2,,,,,
-,"24dabb1b9e2035f43f9eb0e56d75533c","tt_content",297,"tx_testdatahandler_select",2,0,0,"tx_testdatahandler_element",3,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"1d5f3ff5e2c46e921da27c6379578cbb","tt_content",297,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"e17fe872ae38f0fbce0763d3c54b3af3","tt_content",297,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"85b4354bfb83d5205f4cbf53c6634e2c","tt_content",298,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"0f2f6a320a96b9c7971a6c3984d939c2","tt_content",298,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",3,,
+,"24dabb1b9e2035f43f9eb0e56d75533c","tt_content",297,"tx_testdatahandler_select",,,,2,0,0,"tx_testdatahandler_element",3,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/changeElementRelationSorting.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/changeElementRelationSorting.csv
index b5eee599ca9fa2146ad84961a5c800a1fba0ae9d..4bd0b36460044eac72df3d39ed25c4583435d7eb 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/changeElementRelationSorting.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/changeElementRelationSorting.csv
@@ -14,8 +14,8 @@
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"fb9a4c46d91b175ee7503de71523c849","tt_content",298,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"f54bf3a4ddc51685c0586b31015312cb","tt_content",298,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",3,,,,,
-,"5022c22882b256bd6c7851a8a3ca7a26","tt_content",297,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"d94225370737f4c66151f47dce5a87ee","tt_content",297,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",1,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"85b4354bfb83d5205f4cbf53c6634e2c","tt_content",298,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"0f2f6a320a96b9c7971a6c3984d939c2","tt_content",298,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",3,,
+,"5022c22882b256bd6c7851a8a3ca7a26","tt_content",297,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"d94225370737f4c66151f47dce5a87ee","tt_content",297,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",1,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/changeElementSorting.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/changeElementSorting.csv
index 541975c77bde90800cf763f16d53fd7c1213c795..3279b14360c9d8a1e9b65d43006f6a41f7363491 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/changeElementSorting.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/changeElementSorting.csv
@@ -14,8 +14,8 @@
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"d7065184b2d510f3fada875169bc8c57","tt_content",297,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"d333521843e8774369e112581bd4643b","tt_content",297,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",2,,,,,
-,"fb9a4c46d91b175ee7503de71523c849","tt_content",298,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"f54bf3a4ddc51685c0586b31015312cb","tt_content",298,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",3,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"1d5f3ff5e2c46e921da27c6379578cbb","tt_content",297,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"e17fe872ae38f0fbce0763d3c54b3af3","tt_content",297,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"85b4354bfb83d5205f4cbf53c6634e2c","tt_content",298,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"0f2f6a320a96b9c7971a6c3984d939c2","tt_content",298,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",3,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/copyContentOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/copyContentOfRelation.csv
index 2a6e080556187557c58d792120437610f80ae8c4..64294a0c08219ee351cb35b541f593f69c1a9b6b 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/copyContentOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/copyContentOfRelation.csv
@@ -15,10 +15,10 @@
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"d7065184b2d510f3fada875169bc8c57","tt_content",297,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"d333521843e8774369e112581bd4643b","tt_content",297,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",2,,,,,
-,"fb9a4c46d91b175ee7503de71523c849","tt_content",298,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"f54bf3a4ddc51685c0586b31015312cb","tt_content",298,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",3,,,,,
-,"fce12788e8f11c00d2b263acbfad821a","tt_content",299,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"bc041bae0269a2585427007b079be22b","tt_content",299,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",3,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"1d5f3ff5e2c46e921da27c6379578cbb","tt_content",297,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"e17fe872ae38f0fbce0763d3c54b3af3","tt_content",297,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"85b4354bfb83d5205f4cbf53c6634e2c","tt_content",298,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"0f2f6a320a96b9c7971a6c3984d939c2","tt_content",298,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",3,,
+,"fce12788e8f11c00d2b263acbfad821a","tt_content",299,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"bc041bae0269a2585427007b079be22b","tt_content",299,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",3,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/copyContentToLanguageOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/copyContentToLanguageOfRelation.csv
index c012ea4128cc2a516546023db18ff20be025440d..494893644b44c66a448a7936a8fb00d9e71c8f57 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/copyContentToLanguageOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/copyContentToLanguageOfRelation.csv
@@ -15,10 +15,10 @@
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"d7065184b2d510f3fada875169bc8c57","tt_content",297,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"d333521843e8774369e112581bd4643b","tt_content",297,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",2,,,,,
-,"fb9a4c46d91b175ee7503de71523c849","tt_content",298,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"f54bf3a4ddc51685c0586b31015312cb","tt_content",298,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",3,,,,,
-,"fce12788e8f11c00d2b263acbfad821a","tt_content",299,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"bc041bae0269a2585427007b079be22b","tt_content",299,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",3,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"1d5f3ff5e2c46e921da27c6379578cbb","tt_content",297,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"e17fe872ae38f0fbce0763d3c54b3af3","tt_content",297,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"85b4354bfb83d5205f4cbf53c6634e2c","tt_content",298,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"0f2f6a320a96b9c7971a6c3984d939c2","tt_content",298,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",3,,
+,"fce12788e8f11c00d2b263acbfad821a","tt_content",299,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"bc041bae0269a2585427007b079be22b","tt_content",299,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",3,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/copyElementOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/copyElementOfRelation.csv
index e2efb39f2cd5e53c5cbe1a9bc72edf66414fa6f1..0499978c094177a5e6e7380472f7048ceed47e7c 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/copyElementOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/copyElementOfRelation.csv
@@ -15,8 +15,8 @@
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
,4,89,128,0,0,0,1,0,0,0,0,0,"Element #1 (copy 1)",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"d7065184b2d510f3fada875169bc8c57","tt_content",297,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"d333521843e8774369e112581bd4643b","tt_content",297,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",2,,,,,
-,"fb9a4c46d91b175ee7503de71523c849","tt_content",298,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"f54bf3a4ddc51685c0586b31015312cb","tt_content",298,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",3,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"1d5f3ff5e2c46e921da27c6379578cbb","tt_content",297,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"e17fe872ae38f0fbce0763d3c54b3af3","tt_content",297,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"85b4354bfb83d5205f4cbf53c6634e2c","tt_content",298,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"0f2f6a320a96b9c7971a6c3984d939c2","tt_content",298,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",3,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/copyElementToLanguageOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/copyElementToLanguageOfRelation.csv
index 0cfff230e300ea2dba9d7861efec48b362a24b4b..f9d851f9f6f45adf6fb20e91c4eaaf216515229a 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/copyElementToLanguageOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/copyElementToLanguageOfRelation.csv
@@ -15,9 +15,9 @@
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
,4,89,384,0,1,0,1,0,0,0,0,0,"[Translate to Dansk:] Element #1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"d7065184b2d510f3fada875169bc8c57","tt_content",297,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"d333521843e8774369e112581bd4643b","tt_content",297,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",2,,,,,
-,"fb9a4c46d91b175ee7503de71523c849","tt_content",298,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"f54bf3a4ddc51685c0586b31015312cb","tt_content",298,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",3,,,,,
-,"6295e5b12a34d93181092e4ba52085aa","tx_testdatahandler_element",4,"sys_language_uid",0,0,0,"sys_language",1,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"1d5f3ff5e2c46e921da27c6379578cbb","tt_content",297,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"e17fe872ae38f0fbce0763d3c54b3af3","tt_content",297,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"85b4354bfb83d5205f4cbf53c6634e2c","tt_content",298,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"0f2f6a320a96b9c7971a6c3984d939c2","tt_content",298,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",3,,
+,"6295e5b12a34d93181092e4ba52085aa","tx_testdatahandler_element",4,"sys_language_uid",,,,0,0,0,"sys_language",1,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/createContentNAddRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/createContentNAddRelation.csv
index 25d0fab71d6abb1cf451eea306a30a1a765125c2..08c2bc5c1e471f73df3b025184e575d66fc2e1a6 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/createContentNAddRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/createContentNAddRelation.csv
@@ -15,9 +15,9 @@
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"d7065184b2d510f3fada875169bc8c57","tt_content",297,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"d333521843e8774369e112581bd4643b","tt_content",297,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",2,,,,,
-,"fb9a4c46d91b175ee7503de71523c849","tt_content",298,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"f54bf3a4ddc51685c0586b31015312cb","tt_content",298,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",3,,,,,
-,"39931f108e699e2f1505e683c72762b4","tt_content",299,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",1,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"1d5f3ff5e2c46e921da27c6379578cbb","tt_content",297,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"e17fe872ae38f0fbce0763d3c54b3af3","tt_content",297,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"85b4354bfb83d5205f4cbf53c6634e2c","tt_content",298,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"0f2f6a320a96b9c7971a6c3984d939c2","tt_content",298,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",3,,
+,"39931f108e699e2f1505e683c72762b4","tt_content",299,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",1,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/createContentNCreateRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/createContentNCreateRelation.csv
index 594c2112d3740d1f9df2398a9bf81863590f7a29..4195b7c4549a19d983ec538f7242b99189a9d923 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/createContentNCreateRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/createContentNCreateRelation.csv
@@ -16,9 +16,9 @@
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
,4,89,128,0,0,0,0,0,0,0,0,0,"Testing #1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"d7065184b2d510f3fada875169bc8c57","tt_content",297,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"d333521843e8774369e112581bd4643b","tt_content",297,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",2,,,,,
-,"fb9a4c46d91b175ee7503de71523c849","tt_content",298,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"f54bf3a4ddc51685c0586b31015312cb","tt_content",298,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",3,,,,,
-,"2870aca06da1b9043e8ccbe6bf5bf0e4","tt_content",299,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",4,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"1d5f3ff5e2c46e921da27c6379578cbb","tt_content",297,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"e17fe872ae38f0fbce0763d3c54b3af3","tt_content",297,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"85b4354bfb83d5205f4cbf53c6634e2c","tt_content",298,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"0f2f6a320a96b9c7971a6c3984d939c2","tt_content",298,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",3,,
+,"2870aca06da1b9043e8ccbe6bf5bf0e4","tt_content",299,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",4,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/deleteContentOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/deleteContentOfRelation.csv
index dab2e3acfa75adfa51803fcb4862d0577bf632ec..742a62daada2f2b3539cd205baae053f722a767b 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/deleteContentOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/deleteContentOfRelation.csv
@@ -14,8 +14,8 @@
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"d7065184b2d510f3fada875169bc8c57","tt_content",297,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"d333521843e8774369e112581bd4643b","tt_content",297,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",2,,,,,
-,"7ad1a392c016a4fb59c92b3ad7dd0501","tt_content",298,"tx_testdatahandler_select",0,1,0,"tx_testdatahandler_element",2,,,,,
-,"2c8ee1c5c1d865bfb672fc7e684cf95e","tt_content",298,"tx_testdatahandler_select",1,1,0,"tx_testdatahandler_element",3,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"1d5f3ff5e2c46e921da27c6379578cbb","tt_content",297,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"e17fe872ae38f0fbce0763d3c54b3af3","tt_content",297,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"7ad1a392c016a4fb59c92b3ad7dd0501","tt_content",298,"tx_testdatahandler_select",,,,0,1,0,"tx_testdatahandler_element",2,,
+,"2c8ee1c5c1d865bfb672fc7e684cf95e","tt_content",298,"tx_testdatahandler_select",,,,1,1,0,"tx_testdatahandler_element",3,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/deleteElementOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/deleteElementOfRelation.csv
index 9c0667fea1b35e64ce8bab5a8956bbd056ae6b3b..107602280d694d5b64fa98320a6ce01a216fa195 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/deleteElementOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/deleteElementOfRelation.csv
@@ -14,8 +14,8 @@
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"1d5f3ff5e2c46e921da27c6379578cbb","tt_content",297,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"e17fe872ae38f0fbce0763d3c54b3af3","tt_content",297,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",2,,,,,
-,"fb9a4c46d91b175ee7503de71523c849","tt_content",298,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"f54bf3a4ddc51685c0586b31015312cb","tt_content",298,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",3,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"1d5f3ff5e2c46e921da27c6379578cbb","tt_content",297,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"e17fe872ae38f0fbce0763d3c54b3af3","tt_content",297,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"85b4354bfb83d5205f4cbf53c6634e2c","tt_content",298,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"0f2f6a320a96b9c7971a6c3984d939c2","tt_content",298,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",3,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/deleteElementRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/deleteElementRelation.csv
index 6672748135ce442b8789fd4e6020dd49196f06c2..07027dfed0ac50b2a4aa49d56edd65c601252620 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/deleteElementRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/deleteElementRelation.csv
@@ -14,7 +14,7 @@
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"fb9a4c46d91b175ee7503de71523c849","tt_content",298,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"f54bf3a4ddc51685c0586b31015312cb","tt_content",298,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",3,,,,,
-,"1d5f3ff5e2c46e921da27c6379578cbb","tt_content",297,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",1,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"1d5f3ff5e2c46e921da27c6379578cbb","tt_content",297,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"85b4354bfb83d5205f4cbf53c6634e2c","tt_content",298,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"0f2f6a320a96b9c7971a6c3984d939c2","tt_content",298,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",3,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/localizeContentOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/localizeContentOfRelation.csv
index ababf2423609734d07e5d4c7e28dc0215454fa54..dc44ee3a5713c847ffd3eb81b9d2768231368c05 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/localizeContentOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/localizeContentOfRelation.csv
@@ -15,11 +15,11 @@
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"d7065184b2d510f3fada875169bc8c57","tt_content",297,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"d333521843e8774369e112581bd4643b","tt_content",297,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",2,,,,,
-,"fb9a4c46d91b175ee7503de71523c849","tt_content",298,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"f54bf3a4ddc51685c0586b31015312cb","tt_content",298,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",3,,,,,
-,"aa9d44bd50d47873e29c5a4987bda6e0","tt_content",299,"l18n_parent",0,0,0,"tt_content",298,,,,,
-,"fce12788e8f11c00d2b263acbfad821a","tt_content",299,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"bc041bae0269a2585427007b079be22b","tt_content",299,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",3,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"1d5f3ff5e2c46e921da27c6379578cbb","tt_content",297,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"e17fe872ae38f0fbce0763d3c54b3af3","tt_content",297,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"85b4354bfb83d5205f4cbf53c6634e2c","tt_content",298,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"0f2f6a320a96b9c7971a6c3984d939c2","tt_content",298,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",3,,
+,"aa9d44bd50d47873e29c5a4987bda6e0","tt_content",299,"l18n_parent",,,,0,0,0,"tt_content",298,,
+,"fce12788e8f11c00d2b263acbfad821a","tt_content",299,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"bc041bae0269a2585427007b079be22b","tt_content",299,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",3,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/localizeElementOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/localizeElementOfRelation.csv
index 6d7b359d02535e586f5326124a37d9632b98f819..cf4941b23d4c3cb1fdc01b465cc4308297747fa2 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/localizeElementOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/localizeElementOfRelation.csv
@@ -16,12 +16,12 @@
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
,4,89,384,0,1,1,1,0,0,0,0,0,"[Translate to Dansk:] Element #1",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"d7065184b2d510f3fada875169bc8c57","tt_content",297,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"d333521843e8774369e112581bd4643b","tt_content",297,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",2,,,,,
-,"fb9a4c46d91b175ee7503de71523c849","tt_content",298,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"f54bf3a4ddc51685c0586b31015312cb","tt_content",298,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",3,,,,,
-,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",0,0,0,"pages",89,,,,,
-,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"6295e5b12a34d93181092e4ba52085aa","tx_testdatahandler_element",4,"sys_language_uid",0,0,0,"sys_language",1,,,,,
-,"32a0e9a36faa56d270354f77654b15f7","tx_testdatahandler_element",4,"l10n_parent",0,0,0,"tx_irretutorial_1nff_hotel",1,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"1d5f3ff5e2c46e921da27c6379578cbb","tt_content",297,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"e17fe872ae38f0fbce0763d3c54b3af3","tt_content",297,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"85b4354bfb83d5205f4cbf53c6634e2c","tt_content",298,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"0f2f6a320a96b9c7971a6c3984d939c2","tt_content",298,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",3,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,0,"pages",89,,
+,"885fa8b0049daa6a9f6989e7bc55ae11","pages",91,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"6295e5b12a34d93181092e4ba52085aa","tx_testdatahandler_element",4,"sys_language_uid",,,,0,0,0,"sys_language",1,,
+,"32a0e9a36faa56d270354f77654b15f7","tx_testdatahandler_element",4,"l10n_parent",,,,0,0,0,"tx_irretutorial_1nff_hotel",1,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/modifyBothSidesOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/modifyBothSidesOfRelation.csv
index 3470a1994ac8956fb9b3b95fbff1624b7deabc9c..073ec61091ab3e0e8f6ca6cbea6aa6f736f5c570 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/modifyBothSidesOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/modifyBothSidesOfRelation.csv
@@ -14,8 +14,8 @@
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"fb9a4c46d91b175ee7503de71523c849","tt_content",298,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"f54bf3a4ddc51685c0586b31015312cb","tt_content",298,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",3,,,,,
-,"1d5f3ff5e2c46e921da27c6379578cbb","tt_content",297,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"e17fe872ae38f0fbce0763d3c54b3af3","tt_content",297,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",2,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"1d5f3ff5e2c46e921da27c6379578cbb","tt_content",297,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"e17fe872ae38f0fbce0763d3c54b3af3","tt_content",297,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"85b4354bfb83d5205f4cbf53c6634e2c","tt_content",298,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"0f2f6a320a96b9c7971a6c3984d939c2","tt_content",298,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",3,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/modifyContentOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/modifyContentOfRelation.csv
index 1b7a86adbb05a3a5718ea23ce3b9f65c44243d25..bc8e439bc4a8b0d9a7b88e4e2bcfbcbd8ee4523f 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/modifyContentOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/modifyContentOfRelation.csv
@@ -14,8 +14,8 @@
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"fb9a4c46d91b175ee7503de71523c849","tt_content",298,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"f54bf3a4ddc51685c0586b31015312cb","tt_content",298,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",3,,,,,
-,"1d5f3ff5e2c46e921da27c6379578cbb","tt_content",297,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"e17fe872ae38f0fbce0763d3c54b3af3","tt_content",297,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",2,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"1d5f3ff5e2c46e921da27c6379578cbb","tt_content",297,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"e17fe872ae38f0fbce0763d3c54b3af3","tt_content",297,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"85b4354bfb83d5205f4cbf53c6634e2c","tt_content",298,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"0f2f6a320a96b9c7971a6c3984d939c2","tt_content",298,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",3,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/modifyElementOfRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/modifyElementOfRelation.csv
index 35fd5c4db8a3ecb4df2a75d06a2206c55805a2fa..de410f653114f6b787baec4611f4f68c524d1e95 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/modifyElementOfRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/modifyElementOfRelation.csv
@@ -14,8 +14,8 @@
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"d7065184b2d510f3fada875169bc8c57","tt_content",297,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"d333521843e8774369e112581bd4643b","tt_content",297,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",2,,,,,
-,"fb9a4c46d91b175ee7503de71523c849","tt_content",298,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"f54bf3a4ddc51685c0586b31015312cb","tt_content",298,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",3,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"1d5f3ff5e2c46e921da27c6379578cbb","tt_content",297,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"e17fe872ae38f0fbce0763d3c54b3af3","tt_content",297,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"85b4354bfb83d5205f4cbf53c6634e2c","tt_content",298,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"0f2f6a320a96b9c7971a6c3984d939c2","tt_content",298,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",3,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/moveContentOfRelationToDifferentPage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/moveContentOfRelationToDifferentPage.csv
index ec1b2b3b56c2f498f512290ee8844c52d6c875c2..a45b53c9fab2bbf3f30bc6d5ff324c57ab3f4b5a 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/moveContentOfRelationToDifferentPage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Select/Modify/DataSet/moveContentOfRelationToDifferentPage.csv
@@ -14,8 +14,8 @@
,2,89,512,0,0,0,0,0,0,0,0,0,"Element #2",
,3,89,768,0,0,0,0,0,0,0,0,0,"Element #3",
"sys_refindex",,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","sorting","deleted","workspace","ref_table","ref_uid",,,,,
-,"d7065184b2d510f3fada875169bc8c57","tt_content",297,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",1,,,,,
-,"d333521843e8774369e112581bd4643b","tt_content",297,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",2,,,,,
-,"fb9a4c46d91b175ee7503de71523c849","tt_content",298,"tx_testdatahandler_select",0,0,0,"tx_testdatahandler_element",2,,,,,
-,"f54bf3a4ddc51685c0586b31015312cb","tt_content",298,"tx_testdatahandler_select",1,0,0,"tx_testdatahandler_element",3,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","workspace","ref_table","ref_uid","ref_string",
+,"1d5f3ff5e2c46e921da27c6379578cbb","tt_content",297,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",1,,
+,"e17fe872ae38f0fbce0763d3c54b3af3","tt_content",297,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",2,,
+,"85b4354bfb83d5205f4cbf53c6634e2c","tt_content",298,"tx_testdatahandler_select",,,,0,0,0,"tx_testdatahandler_element",2,,
+,"0f2f6a320a96b9c7971a6c3984d939c2","tt_content",298,"tx_testdatahandler_select",,,,1,0,0,"tx_testdatahandler_element",3,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Slug/SlugHelperTest.php b/typo3/sysext/core/Tests/Functional/DataHandling/Slug/SlugHelperTest.php
index 5d06e82c2d381fe2cdd5ac552dd89e7263304791..0169883d022ada1ce2621e7f456b51297e3043d5 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Slug/SlugHelperTest.php
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Slug/SlugHelperTest.php
@@ -31,6 +31,11 @@ class SlugHelperTest extends AbstractDataHandlerActionTestCase
*/
protected $scenarioDataSetDirectory = 'typo3/sysext/core/Tests/Functional/DataHandling/Slug/DataSet/';
+ /**
+ * @var bool Reference index testing not relevant here.
+ */
+ protected $assertCleanReferenceIndex = false;
+
/**
* Default Site Configuration
* @var array
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/EnableFieldsTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/EnableFieldsTest.php
index ef8e4ec415014ecd16162705e483f296cb1e20d9..11b03f220438fa2dc887d6350224713716261457 100644
--- a/typo3/sysext/extbase/Tests/Functional/Persistence/EnableFieldsTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Persistence/EnableFieldsTest.php
@@ -34,6 +34,11 @@ class EnableFieldsTest extends AbstractDataHandlerActionTestCase
*/
protected $coreExtensionsToLoad = ['core', 'extbase', 'fluid'];
+ /**
+ * @var bool Reference index testing not relevant here.
+ */
+ protected $assertCleanReferenceIndex = false;
+
/**
* Sets up this test suite.
*/
diff --git a/typo3/sysext/frontend/Tests/Functional/Rendering/DataSet/LiveDefaultElements.csv b/typo3/sysext/frontend/Tests/Functional/Rendering/DataSet/LiveDefaultElements.csv
index ded7f23ea03e9628b5e53d80972915ff6a59cf50..9e7f3d62c7cc3213177fbe4b1ebd06df5ac03006 100644
--- a/typo3/sysext/frontend/Tests/Functional/Rendering/DataSet/LiveDefaultElements.csv
+++ b/typo3/sysext/frontend/Tests/Functional/Rendering/DataSet/LiveDefaultElements.csv
@@ -39,7 +39,7 @@
,129,89,"[T3BOARD] Image added in Dansk (without parent)",1,300,1,0,0,0,0,0,0,0,"tt_content","image",2,"sys_file",,,,
,130,89,"[T3BOARD] Image added to DK element without default language",1,303,1,0,0,0,0,0,0,0,"tt_content","image",1,"sys_file",,,,
,131,89,"[T3BOARD] image translated to DE from DK",1,302,2,0,0,0,0,0,0,0,"tt_content","image",1,"sys_file",,,,
-,132,89,Kasper2,1,298,0,0,0,0,0,0,0,0,"tt_content","image",1,"sys_file",,,,
+,132,89,"Kasper2",1,298,0,0,0,0,0,0,0,0,"tt_content","image",1,"sys_file",,,,
"sys_category",,,,,,,,,,,,,,,,,,,,,
,"uid","pid","title","sys_language_uid","l10n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","deleted",,,,,,,,,,
,1,89,"Category 1",0,0,0,0,0,0,0,0,,,,,,,,,,
@@ -52,3 +52,46 @@
,3,297,"tt_content","categories",0,1,,,,,,,,,,,,,,,
,1,301,"tt_content","categories",0,1,,,,,,,,,,,,,,,
,4,301,"tt_content","categories",0,1,,,,,,,,,,,,,,,
+"sys_refindex",,,,,,,,,,,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","ref_table","ref_uid","ref_string",,,,,,,,,
+,"3cad1c071de626e0cee1f13390353506","pages",90,"l10n_parent",,,,0,0,"pages",89,,,,,,,,,,
+,"a496b183232631a70aa66161d486d841","pages",90,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,,,,,
+,"7495604375ab4caae25ea3da5e76f6c3","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,,,,,
+,"b40d65b4f2458fc6a61f49e3f5c36d4f","pages",91,"sys_language_uid",,,,0,0,"sys_language",3,,,,,,,,,,
+,"5bddb7049d8f2cd5c34fbb788ad2492c","sys_category",1,"items",,,,0,0,"tt_content",297,,,,,,,,,,
+,"93bf5fa805264628329e352cd5d5253f","sys_category",1,"items",,,,1,0,"tt_content",301,,,,,,,,,,
+,"fc9bacfc49061b915fd771b8e1e624dc","sys_category",2,"l10n_parent",,,,0,0,"sys_category",1,,,,,,,,,,
+,"9e176a756a30e98f0ac0715127b7984c","sys_category",3,"items",,,,0,0,"tt_content",297,,,,,,,,,,
+,"252e5a027b09cd62bba37816374daeea","sys_category",4,"items",,,,0,0,"tt_content",301,,,,,,,,,,
+,"b1315f6a325027205050c81764294b72","sys_file",1,"storage",,,,0,0,"sys_file_storage",1,,,,,,,,,,
+,"10034d14de6b8c87aa0096de9d029498","sys_file",1,"metadata",,,,0,0,"sys_file_metadata",1,,,,,,,,,,
+,"eae80c8f074f9bea74f82f6d7145e6b2","sys_file",20,"storage",,,,0,0,"sys_file_storage",1,,,,,,,,,,
+,"6588728f1c2f2069b4b781ab1d102fff","sys_file",21,"storage",,,,0,0,"sys_file_storage",1,,,,,,,,,,
+,"ff0a9ca5f364b75bccb699b74d167c83","sys_file",21,"metadata",,,,0,0,"sys_file_metadata",21,,,,,,,,,,
+,"557de1cd99f1b4d25f681d822c060598","sys_file_metadata",1,"file",,,,0,0,"sys_file",1,,,,,,,,,,
+,"4821da930346696406e3ccf3ec22d999","sys_file_metadata",21,"file",,,,0,0,"sys_file",21,,,,,,,,,,
+,"aa821da8cdc56afc736974735c9b1c1c","sys_file_reference",126,"uid_local",,,,0,0,"sys_file",1,,,,,,,,,,
+,"8e50f38980afa6f4e84530b12f9cd0b3","sys_file_reference",127,"uid_local",,,,0,0,"sys_file",21,,,,,,,,,,
+,"58e0ab87ebc31708462d266cbec3ec3e","sys_file_reference",128,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,,,,,
+,"2a1ce6ba4fb74bb55cef961bd4923434","sys_file_reference",128,"l10n_parent",,,,0,0,"sys_file_reference",127,,,,,,,,,,
+,"1f1d715dd5783cd50ecbda978e23dccb","sys_file_reference",128,"uid_local",,,,0,0,"sys_file",21,,,,,,,,,,
+,"2af010d2886de3b611103eabc9ab5757","sys_file_reference",129,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,,,,,
+,"c08c2538c324b0a98b0957bc4bdf36ae","sys_file_reference",129,"uid_local",,,,0,0,"sys_file",1,,,,,,,,,,
+,"4f4fdde6552680fd5684bbd5d92f2198","sys_file_reference",130,"sys_language_uid",,,,0,0,"sys_language",1,,,,,,,,,,
+,"bb218c2fe53f7e399a6677966d9e24ab","sys_file_reference",130,"uid_local",,,,0,0,"sys_file",1,,,,,,,,,,
+,"3746cc9c0477786890a347aea98802c1","sys_file_reference",131,"sys_language_uid",,,,0,0,"sys_language",2,,,,,,,,,,
+,"0e374e0da126c39774d168d96b06c743","sys_file_reference",131,"uid_local",,,,0,0,"sys_file",1,,,,,,,,,,
+,"96faaba988970bfcd00b334d8925b5ec","sys_file_reference",132,"uid_local",,,,0,0,"sys_file",1,,,,,,,,,,
+,"c764613989e88545f6445dee3cf48543","tt_content",297,"image",,,,0,0,"sys_file_reference",126,,,,,,,,,,
+,"42f061a61b5b73c0c568de68fb908cdd","tt_content",298,"image",,,,0,0,"sys_file_reference",132,,,,,,,,,,
+,"eb394ce9b85c670caa317333af47684c","tt_content",299,"image",,,,0,0,"sys_file_reference",127,,,,,,,,,,
+,"acac9935bf9b184ae25ee925d8457c25","tt_content",300,"l18n_parent",,,,0,0,"tt_content",299,,,,,,,,,,
+,"ea24217b47c76f3da6fd2af21e896d52","tt_content",300,"image",,,,0,0,"sys_file_reference",128,,,,,,,,,,
+,"96b347ae8831658cc2e96316101e0c41","tt_content",300,"image",,,,1,0,"sys_file_reference",129,,,,,,,,,,
+,"eb360eb09940bbb656509c7f6fda9b05","tt_content",301,"l18n_parent",,,,0,0,"tt_content",297,,,,,,,,,,
+,"b6e55a3d99888c9a7007226ad685306c","tt_content",302,"l18n_parent",,,,0,0,"tt_content",297,,,,,,,,,,
+,"4a87b85a1395cfe506880085dfd1f92a","tt_content",302,"image",,,,0,0,"sys_file_reference",131,,,,,,,,,,
+,"546632339093dfd5692ea899d3fe4cc7","tt_content",303,"image",,,,0,0,"sys_file_reference",130,,,,,,,,,,
+,"7baa3a794e6bf0bb77f99053514cc6f5","tt_content",305,"l18n_parent",,,,0,0,"tt_content",297,,,,,,,,,,
+,"8e0c1758f63cb3f2ce6e47dae7e1cda1","tt_content",308,"l18n_parent",,,,0,0,"tt_content",307,,,,,,,,,,
+,"32480f8c86a66aabe38b21d586d099a4","tt_content",309,"l18n_parent",,,,0,0,"tt_content",298,,,,,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Discard/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Discard/ActionTest.php
index 365c9170407ec01d9c1087206cbb1a7795c82de2..7dee4c1437d92171078aa906f207ecef62f518bf 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Discard/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Discard/ActionTest.php
@@ -28,8 +28,9 @@ class ActionTest extends AbstractActionTestCase
protected $assertionDataSetDirectory = 'typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Discard/DataSet/';
/**
- * Content records
+ * @var bool False as temporary hack
*/
+ protected $assertCleanReferenceIndex = false;
/**
* @test
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/ActionTest.php
index 759de1f8bac2d5cd18ebe094113883e5713782df..8c0cfb6ece9bc9846692825d423855dd63aaa9c1 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/ActionTest.php
@@ -28,8 +28,9 @@ class ActionTest extends AbstractActionTestCase
protected $assertionDataSetDirectory = 'typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/';
/**
- * Content records
+ * @var bool False as temporary hack
*/
+ protected $assertCleanReferenceIndex = false;
/**
* @test
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/ActionTest.php
index b8010e729205d1b028ab737436e438ca2f1c0b2a..ad05666ca15a1e84e9ddf0fb2503ac0f0a1944db 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/ActionTest.php
@@ -28,8 +28,9 @@ class ActionTest extends AbstractActionTestCase
protected $assertionDataSetDirectory = 'typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/';
/**
- * Content records
+ * @var bool False as temporary hack
*/
+ protected $assertCleanReferenceIndex = false;
/**
* @test
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/ActionTest.php
index 0052c693bef9ba185b7a5ef6c79235058ac5b8db..5f31b8b7718a9a2d3089f57a70a6b4b4d6ef8099 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/ActionTest.php
@@ -28,8 +28,9 @@ class ActionTest extends AbstractActionTestCase
protected $assertionDataSetDirectory = 'typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/';
/**
- * Content records
+ * @var bool False as temporary hack
*/
+ protected $assertCleanReferenceIndex = false;
/**
* @test
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/DataSet/LiveDefaultElements.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/DataSet/LiveDefaultElements.csv
index d4e42e3c7f4fb846079244586c375c3b6f06ee2e..f4a6d23a44254cfac6a0ff723d253d2eae6850cc 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/DataSet/LiveDefaultElements.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/DataSet/LiveDefaultElements.csv
@@ -18,3 +18,9 @@
,1,89,256,0,0,0,0,0,0,0,0,"Element #1",,,,,
,2,89,512,0,0,0,0,0,0,0,0,"Element #2",,,,,
,3,89,768,0,0,0,0,0,0,0,0,"Element #3",,,,,
+"sys_refindex",,,,,,,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","ref_table","ref_uid","ref_string",,,,,
+,"0c81d9b3f27460380a2e442fdfa0649d","tt_content",298,"tx_testdatahandler_group",,,,0,0,"tx_testdatahandler_element",2,,,,,,
+,"8f3d6a0de293045066188fc790f4805f","tt_content",298,"tx_testdatahandler_group",,,,1,0,"tx_testdatahandler_element",3,,,,,,
+,"70386199b2e7d7e3be07ec7b501f411d","tt_content",297,"tx_testdatahandler_group",,,,0,0,"tx_testdatahandler_element",1,,,,,,
+,"3f113b20cdf1b3be96048a257872a178","tt_content",297,"tx_testdatahandler_group",,,,1,0,"tx_testdatahandler_element",2,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/DataSet/ReferenceIndex.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/DataSet/ReferenceIndex.csv
deleted file mode 100644
index 1eb737c73f22df9e7e4ba40a267f0df04022238d..0000000000000000000000000000000000000000
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/DataSet/ReferenceIndex.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-"sys_refindex",,,,,,,,,,,,
-,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","ref_table","ref_uid","ref_string"
-,"0c81d9b3f27460380a2e442fdfa0649d","tt_content",298,"tx_testdatahandler_group",,,,0,0,"tx_testdatahandler_element",2,
-,"8f3d6a0de293045066188fc790f4805f","tt_content",298,"tx_testdatahandler_group",,,,1,0,"tx_testdatahandler_element",3,
-,"70386199b2e7d7e3be07ec7b501f411d","tt_content",297,"tx_testdatahandler_group",,,,0,0,"tx_testdatahandler_element",1,
-,"3f113b20cdf1b3be96048a257872a178","tt_content",297,"tx_testdatahandler_group",,,,1,0,"tx_testdatahandler_element",2,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Discard/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Discard/ActionTest.php
index f26561352dfe099618dfdc62f8d2c96ae31b5627..c13311bd0876f7d3bf3ff9a8b96878265e9777b4 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Discard/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Discard/ActionTest.php
@@ -28,8 +28,9 @@ class ActionTest extends AbstractActionTestCase
protected $assertionDataSetDirectory = 'typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Discard/DataSet/';
/**
- * Relations
+ * @var bool False as temporary hack
*/
+ protected $assertCleanReferenceIndex = false;
/**
* @test
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/ActionTest.php
index 80db33d4ff2acb7e24d5e6560c28715094cb90b5..91b647315b2e3af841f8c2ada75707a5c049a79f 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/ActionTest.php
@@ -28,8 +28,9 @@ class ActionTest extends AbstractActionTestCase
protected $assertionDataSetDirectory = 'typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/DataSet/';
/**
- * Relations
+ * @var bool False as temporary hack
*/
+ protected $assertCleanReferenceIndex = false;
/**
* @test
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Publish/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Publish/ActionTest.php
index 0748398494ca568370a51327fc94debe80a06960..595c5fea62790f3093a256bdde9fd3ddc65c1e01 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Publish/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Publish/ActionTest.php
@@ -28,8 +28,9 @@ class ActionTest extends AbstractActionTestCase
protected $assertionDataSetDirectory = 'typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Publish/DataSet/';
/**
- * Relations
+ * @var bool False as temporary hack
*/
+ protected $assertCleanReferenceIndex = false;
/**
* @test
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/PublishAll/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/PublishAll/ActionTest.php
index 5ab4856fd06f86266b51444954042f091d8dfc9b..214352591381ed7d1b9e8462358f71ae7c53a887 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/PublishAll/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/PublishAll/ActionTest.php
@@ -28,8 +28,9 @@ class ActionTest extends AbstractActionTestCase
protected $assertionDataSetDirectory = 'typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/PublishAll/DataSet/';
/**
- * Relations
+ * @var bool False as temporary hack
*/
+ protected $assertCleanReferenceIndex = false;
/**
* @test
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Discard/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Discard/ActionTest.php
index 15ecd3e0fa1d697cd0923101e3eae07baba5bfc1..9dd15c71a45cb21c70342737e78ec3cf8fff6abf 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Discard/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Discard/ActionTest.php
@@ -28,8 +28,9 @@ class ActionTest extends AbstractActionTestCase
protected $assertionDataSetDirectory = 'typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Discard/DataSet/';
/**
- * Parent content records
+ * @var bool False as temporary hack
*/
+ protected $assertCleanReferenceIndex = false;
/**
* @test
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/ActionTest.php
index 0eb3c62daf2189970ce245cef4c421dd92a29a13..8a7823b78a1a70d8b0579bfbaf968f23ffe96833 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/ActionTest.php
@@ -30,8 +30,9 @@ class ActionTest extends AbstractActionTestCase
protected $assertionDataSetDirectory = 'typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/';
/**
- * Parent content records
+ * @var bool False as temporary hack
*/
+ protected $assertCleanReferenceIndex = false;
/**
* @test
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/ActionTest.php
index 391dab624cdccbede4c969c42e4b52d5af385c3f..7fe93c17cce1791d3b865aeb0113af0b5c0c77b4 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/ActionTest.php
@@ -28,6 +28,11 @@ class ActionTest extends AbstractActionTestCase
*/
protected $assertionDataSetDirectory = 'typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/';
+ /**
+ * @var bool False as temporary hack
+ */
+ protected $assertCleanReferenceIndex = false;
+
/**
* @test
*/
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/ActionTest.php
index 26c1ea7cf03f74c35b3e7fc71ced639523e94e67..9594ed1e88f518dcbfe6761dd75c1edb35884e89 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/ActionTest.php
@@ -28,6 +28,11 @@ class ActionTest extends AbstractActionTestCase
*/
protected $assertionDataSetDirectory = 'typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/';
+ /**
+ * @var bool False as temporary hack
+ */
+ protected $assertCleanReferenceIndex = false;
+
/**
* @test
*/
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/ActionTest.php
index 94ab7557b22acc32e15e32c66ede0932993fd3b5..bf92cdd5cdd6b023bd27e4fef84cf404b1c949ed 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/ActionTest.php
@@ -28,8 +28,9 @@ class ActionTest extends AbstractActionTestCase
protected $assertionDataSetDirectory = 'typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/';
/**
- * Parent content records
+ * @var bool False as temporary hack
*/
+ protected $assertCleanReferenceIndex = false;
/**
* @test
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/ActionTest.php
index 857c0513edb9f9c9701141286a47439c9bcd92de..70f19a246062539980703e52af85afb2bfac84bc 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/ActionTest.php
@@ -30,8 +30,9 @@ class ActionTest extends AbstractActionTestCase
protected $assertionDataSetDirectory = 'typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/';
/**
- * Parent content records
+ * @var bool False as temporary hack
*/
+ protected $assertCleanReferenceIndex = false;
/**
* @test
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/ActionTest.php
index 4865bc19bd0cc6d1ef2ec6add8c9a0c3a2a575fd..c8455846dda72d11fbdb5c94d19e4ec655a9ae04 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/ActionTest.php
@@ -29,8 +29,9 @@ class ActionTest extends AbstractActionTestCase
protected $assertionDataSetDirectory = 'typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/';
/**
- * Parent content records
+ * @var bool False as temporary hack
*/
+ protected $assertCleanReferenceIndex = false;
/**
* @test
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/ActionTest.php
index 0312ddfd227e7f325be4aee9ad59bc2416f07e66..3b43330a4f466763c63ac7fc1fefd69c082d38d9 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/ActionTest.php
@@ -29,8 +29,9 @@ class ActionTest extends AbstractActionTestCase
protected $assertionDataSetDirectory = 'typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/';
/**
- * Parent content records
+ * @var bool False as temporary hack
*/
+ protected $assertCleanReferenceIndex = false;
/**
* @test
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Discard/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Discard/ActionTest.php
index 73ca3d6475aaa4c490f7e4f14ac0b1a37eeb493f..9f0f35fee27042f262f48e798260c9ec8753b6bf 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Discard/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Discard/ActionTest.php
@@ -27,6 +27,11 @@ class ActionTest extends AbstractActionTestCase
*/
protected $assertionDataSetDirectory = 'typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Discard/DataSet/';
+ /**
+ * @var bool False as temporary hack
+ */
+ protected $assertCleanReferenceIndex = false;
+
/**
* @test
*/
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/ActionTest.php
index 72ae621011488ce4ec29a7ab23384014e6dd5ba9..553682b34975dfbb77cb243194bfdd62b1d9bcf3 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/ActionTest.php
@@ -27,6 +27,11 @@ class ActionTest extends AbstractActionTestCase
*/
protected $assertionDataSetDirectory = 'typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/DataSet/';
+ /**
+ * @var bool False as temporary hack
+ */
+ protected $assertCleanReferenceIndex = false;
+
/**
* @test
*/
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Publish/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Publish/ActionTest.php
index 9f14c74d7736b327af563b5554e2ff31ab7f9f64..0c83bd389626fb43045eb8e2f8672f59ea489bf5 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Publish/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Publish/ActionTest.php
@@ -27,6 +27,11 @@ class ActionTest extends AbstractActionTestCase
*/
protected $assertionDataSetDirectory = 'typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Publish/DataSet/';
+ /**
+ * @var bool False as temporary hack
+ */
+ protected $assertCleanReferenceIndex = false;
+
/**
* @test
*/
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/PublishAll/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/PublishAll/ActionTest.php
index d2efc2666d2b2f9bf682db019b668b323964369c..878a10266b4ac60e47b0376d4758ca935ec3ee19 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/PublishAll/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/PublishAll/ActionTest.php
@@ -27,6 +27,11 @@ class ActionTest extends AbstractActionTestCase
*/
protected $assertionDataSetDirectory = 'typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/PublishAll/DataSet/';
+ /**
+ * @var bool False as temporary hack
+ */
+ protected $assertCleanReferenceIndex = false;
+
/**
* @test
*/
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/ActionTest.php
index 3defa7f32c518604810e0fff4e913cf94a80b121..936cf232e8fff05ee70bfef1cb433ed8b90a32d7 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/ActionTest.php
@@ -28,8 +28,9 @@ class ActionTest extends AbstractActionTestCase
protected $assertionDataSetDirectory = 'typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Discard/DataSet/';
/**
- * Content records
+ * @var bool False as temporary hack
*/
+ protected $assertCleanReferenceIndex = false;
/**
* @test
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/ActionTest.php
index 2c6e11eadbd142192af26681860fcdc7abb2d47e..3f242c1c3813b41c789a4d35f42cc4c1f0da7672 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/ActionTest.php
@@ -31,8 +31,9 @@ class ActionTest extends AbstractActionTestCase
protected $assertionDataSetDirectory = 'typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/DataSet/';
/**
- * Content records
+ * @var bool False as temporary hack
*/
+ protected $assertCleanReferenceIndex = false;
/**
* @test
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/ActionTest.php
index 17f3c62866718640e1b26e669e3c631e33e08dd4..7c168bd0b46a8c7aa6edf5f2207db50067161bf5 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/ActionTest.php
@@ -29,8 +29,9 @@ class ActionTest extends AbstractActionTestCase
protected $assertionDataSetDirectory = 'typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/DataSet/';
/**
- * Content records
+ * @var bool False as temporary hack
*/
+ protected $assertCleanReferenceIndex = false;
/**
* @test
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/ActionTest.php
index 4ed79498c7ff22373a029662b90d4f6e4db5e727..b6a5464c86b6a57553716ea2557c0649b915a783 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/ActionTest.php
@@ -30,8 +30,9 @@ class ActionTest extends AbstractActionTestCase
protected $assertionDataSetDirectory = 'typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/DataSet/';
/**
- * Content records
+ * @var bool False as temporary hack
*/
+ protected $assertCleanReferenceIndex = false;
/**
* @test
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/DataSet/LiveDefaultElements.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/DataSet/LiveDefaultElements.csv
index 6909a879cbb7e2840401165c73e1e0082e7267c3..44f3e9c19b38a5d9b0373a7eaacf2307ac74866d 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/DataSet/LiveDefaultElements.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/DataSet/LiveDefaultElements.csv
@@ -18,3 +18,9 @@
,1,89,256,0,0,0,0,0,0,0,0,"Element #1",,,,,
,2,89,512,0,0,0,0,0,0,0,0,"Element #2",,,,,
,3,89,768,0,0,0,0,0,0,0,0,"Element #3",,,,,
+"sys_refindex",,,,,,,,,,,,,,,,,
+,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","ref_table","ref_uid","ref_string",,,,,
+,"d7065184b2d510f3fada875169bc8c57","tt_content",297,"tx_testdatahandler_select",,,,0,0,"tx_testdatahandler_element",1,,,,,,
+,"d333521843e8774369e112581bd4643b","tt_content",297,"tx_testdatahandler_select",,,,1,0,"tx_testdatahandler_element",2,,,,,,
+,"fb9a4c46d91b175ee7503de71523c849","tt_content",298,"tx_testdatahandler_select",,,,0,0,"tx_testdatahandler_element",2,,,,,,
+,"f54bf3a4ddc51685c0586b31015312cb","tt_content",298,"tx_testdatahandler_select",,,,1,0,"tx_testdatahandler_element",3,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/DataSet/ReferenceIndex.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/DataSet/ReferenceIndex.csv
deleted file mode 100644
index 3c38b9e77b896cec308db606a9d1ddf741861148..0000000000000000000000000000000000000000
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/DataSet/ReferenceIndex.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-"sys_refindex",,,,,,,,,,,,
-,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","deleted","ref_table","ref_uid","ref_string"
-,"d7065184b2d510f3fada875169bc8c57","tt_content",297,"tx_testdatahandler_select",,,,0,0,"tx_testdatahandler_element",1,
-,"d333521843e8774369e112581bd4643b","tt_content",297,"tx_testdatahandler_select",,,,1,0,"tx_testdatahandler_element",2,
-,"fb9a4c46d91b175ee7503de71523c849","tt_content",298,"tx_testdatahandler_select",,,,0,0,"tx_testdatahandler_element",2,
-,"f54bf3a4ddc51685c0586b31015312cb","tt_content",298,"tx_testdatahandler_select",,,,1,0,"tx_testdatahandler_element",3,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Discard/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Discard/ActionTest.php
index f951aea37161092662ff94f0cc30af071bfc7214..a8de7fa3b5f62ed61c6cacc901efa94effd54354 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Discard/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Discard/ActionTest.php
@@ -27,6 +27,11 @@ class ActionTest extends AbstractActionTestCase
*/
protected $assertionDataSetDirectory = 'typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Discard/DataSet/';
+ /**
+ * @var bool False as temporary hack
+ */
+ protected $assertCleanReferenceIndex = false;
+
/**
* @test
*/
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/ActionTest.php
index 526573489e387af60a1a33ce23af7e5967ce0632..606c32816a8658f8724c3e217ec86770fc38c9bf 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/ActionTest.php
@@ -27,6 +27,11 @@ class ActionTest extends AbstractActionTestCase
*/
protected $assertionDataSetDirectory = 'typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/DataSet/';
+ /**
+ * @var bool False as temporary hack
+ */
+ protected $assertCleanReferenceIndex = false;
+
/**
* @test
*/
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Publish/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Publish/ActionTest.php
index 95d8d49fa4f528a6a0872d5e29ceb39b4e350f59..679e204db6d3ab6044f5aa6608b686af2ae8066e 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Publish/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Publish/ActionTest.php
@@ -27,6 +27,11 @@ class ActionTest extends AbstractActionTestCase
*/
protected $assertionDataSetDirectory = 'typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Publish/DataSet/';
+ /**
+ * @var bool False as temporary hack
+ */
+ protected $assertCleanReferenceIndex = false;
+
/**
* @test
*/
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/PublishAll/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/PublishAll/ActionTest.php
index d403c7613f5df6528f32250403690cfe4d5ec1cf..9d0514c79a6346278f262a858e4a80ffc74a5e60 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/PublishAll/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/PublishAll/ActionTest.php
@@ -27,6 +27,11 @@ class ActionTest extends AbstractActionTestCase
*/
protected $assertionDataSetDirectory = 'typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/PublishAll/DataSet/';
+ /**
+ * @var bool False as temporary hack
+ */
+ protected $assertCleanReferenceIndex = false;
+
/**
* @test
*/