From 8da63a4521d684c84607558026fcf708cdd11e09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20Gro=C3=9Fberndt?= <stephan@grossberndt.de>
Date: Mon, 9 Oct 2017 18:48:39 +0200
Subject: [PATCH] [BUGFIX] Disable column sys_file_reference.sorting

Disable the column sys_file_reference.sorting by its according TCA
definition as it is not useful and leads to severe performance issues
adding new references when there are already many references.

Releases: master, 8.7
Resolves: #80800
Change-Id: I7b34a1be7efe3cf4818b43919389d9c815e74ec6
Reviewed-on: https://review.typo3.org/54342
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Benni Mack <benni@typo3.org>
Reviewed-by: Mathias Schreiber <mathias.schreiber@typo3.com>
Tested-by: Mathias Schreiber <mathias.schreiber@typo3.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
---
 .../Configuration/TCA/sys_file_reference.php  |  1 -
 .../FAL/DataSet/LiveDefaultElements.csv       |  8 +++----
 .../Modify/DataSet/changeContentSorting.csv   |  8 +++----
 .../FAL/Modify/DataSet/copyContent.csv        | 12 +++++-----
 .../Modify/DataSet/copyContentToLanguage.csv  | 12 +++++-----
 .../DataSet/createContentWFileReference.csv   | 10 ++++----
 .../FAL/Modify/DataSet/deleteContent.csv      |  8 +++----
 .../FAL/Modify/DataSet/localizeContent.csv    | 12 +++++-----
 .../FAL/Modify/DataSet/modifyContent.csv      |  8 +++----
 .../modifyContentNAddFileReference.csv        | 10 ++++----
 .../modifyContentNDeleteAllFileReference.csv  |  8 +++----
 .../modifyContentNDeleteFileReference.csv     |  8 +++----
 .../DataSet/modifyContentWFileReference.csv   |  8 +++----
 .../DataSet/moveContentToDifferentPage.csv    |  8 +++----
 ...veContentToDifferentPageNChangeSorting.csv |  8 +++----
 .../Rendering/DataSet/LiveDefaultElements.csv | 12 +++++-----
 .../FAL/DataSet/LiveDefaultElements.csv       |  8 +++----
 .../Modify/DataSet/changeContentSorting.csv   | 16 ++++++-------
 .../FAL/Modify/DataSet/copyContent.csv        | 16 ++++++-------
 .../DataSet/createContentWFileReference.csv   | 12 +++++-----
 .../FAL/Modify/DataSet/deleteContent.csv      | 12 +++++-----
 .../FAL/Modify/DataSet/localizeContent.csv    | 16 ++++++-------
 .../FAL/Modify/DataSet/modifyContent.csv      | 12 +++++-----
 .../modifyContentNAddFileReference.csv        | 16 ++++++-------
 .../modifyContentNDeleteAllFileReference.csv  | 12 +++++-----
 .../modifyContentNDeleteFileReference.csv     | 12 +++++-----
 .../DataSet/modifyContentWFileReference.csv   | 12 +++++-----
 .../DataSet/moveContentToDifferentPage.csv    | 16 ++++++-------
 ...veContentToDifferentPageNChangeSorting.csv | 24 +++++++++----------
 .../Publish/DataSet/changeContentSorting.csv  | 12 +++++-----
 .../FAL/Publish/DataSet/copyContent.csv       | 12 +++++-----
 .../DataSet/createContentWFileReference.csv   | 10 ++++----
 .../FAL/Publish/DataSet/deleteContent.csv     | 12 +++++-----
 .../FAL/Publish/DataSet/localizeContent.csv   | 12 +++++-----
 .../FAL/Publish/DataSet/modifyContent.csv     | 12 +++++-----
 .../modifyContentNAddFileReference.csv        | 14 +++++------
 .../modifyContentNDeleteAllFileReference.csv  | 12 +++++-----
 .../modifyContentNDeleteFileReference.csv     | 12 +++++-----
 .../DataSet/modifyContentWFileReference.csv   | 12 +++++-----
 .../DataSet/moveContentToDifferentPage.csv    | 12 +++++-----
 ...veContentToDifferentPageNChangeSorting.csv | 16 ++++++-------
 .../DataSet/changeContentSorting.csv          | 12 +++++-----
 .../FAL/PublishAll/DataSet/copyContent.csv    | 12 +++++-----
 .../DataSet/createContentWFileReference.csv   | 10 ++++----
 .../FAL/PublishAll/DataSet/deleteContent.csv  | 12 +++++-----
 .../PublishAll/DataSet/localizeContent.csv    | 12 +++++-----
 .../FAL/PublishAll/DataSet/modifyContent.csv  | 12 +++++-----
 .../modifyContentNAddFileReference.csv        | 14 +++++------
 .../modifyContentNDeleteAllFileReference.csv  | 12 +++++-----
 .../modifyContentNDeleteFileReference.csv     | 12 +++++-----
 .../DataSet/modifyContentWFileReference.csv   | 12 +++++-----
 .../DataSet/moveContentToDifferentPage.csv    | 12 +++++-----
 ...veContentToDifferentPageNChangeSorting.csv | 16 ++++++-------
 53 files changed, 310 insertions(+), 311 deletions(-)

diff --git a/typo3/sysext/core/Configuration/TCA/sys_file_reference.php b/typo3/sysext/core/Configuration/TCA/sys_file_reference.php
index 001247e81c2c..ccecd6163237 100644
--- a/typo3/sysext/core/Configuration/TCA/sys_file_reference.php
+++ b/typo3/sysext/core/Configuration/TCA/sys_file_reference.php
@@ -15,7 +15,6 @@ return [
         'cruser_id' => 'cruser_id',
         'type' => 'uid_local:type',
         'hideTable' => true,
-        'sortby' => 'sorting',
         'delete' => 'deleted',
         'versioningWS' => true,
         'languageField' => 'sys_language_uid',
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 7ee71c28fb2a..75fa7f37a444 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/DataSet/LiveDefaultElements.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/DataSet/LiveDefaultElements.csv
@@ -18,10 +18,10 @@
 ,21,0,0,0,0,0,0,0,0,0,21,"Image T3BOARD",1024,683,,,0,,,,,,
 "sys_file_reference",,,,,,,,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link","l10n_diffsource"
-,126,89,128,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,,
-,127,89,64,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,,
-,128,89,32,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,,
+,126,89,0,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,,
+,127,89,0,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,,
+,128,89,0,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,,
+,129,89,0,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,,
 "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",,,,,,,,,
 ,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,,
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 59b49dcd5386..92540158cb7d 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
@@ -1,9 +1,9 @@
 "sys_file_reference",,,,,,,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
-,126,89,8,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
-,127,89,4,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
-,128,89,32,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
-,129,89,16,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
+,126,89,0,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
+,127,89,0,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
+,128,89,0,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
+,129,89,0,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
 "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",,,,,,,,
 ,330,89,768,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,
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 86e4d78bae10..3d81e92e137d 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
@@ -1,11 +1,11 @@
 "sys_file_reference",,,,,,,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
-,126,89,128,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
-,127,89,64,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
-,128,89,32,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
-,129,89,16,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
-,130,89,32,0,0,0,0,0,0,0,0,0,21,332,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
-,131,89,16,0,0,0,0,0,0,0,0,0,1,332,"tt_content","image",2,"sys_file","This is Kasper",,,
+,126,89,0,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
+,127,89,0,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
+,128,89,0,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
+,129,89,0,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
+,130,89,0,0,0,0,0,0,0,0,0,0,21,332,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
+,131,89,0,0,0,0,0,0,0,0,0,0,1,332,"tt_content","image",2,"sys_file","This is Kasper",,,
 "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",,,,,,,,
 ,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,
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 d8f00fd9b643..f4defbe27435 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
@@ -1,11 +1,11 @@
 sys_file_reference,,,,,,,,,,,,,,,,,,,,,,
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,
-,127,89,64,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,
-,128,89,32,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,Taken at T3BOARD,,,
-,129,89,16,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,This is Kasper,,,
-,130,89,48,0,1,0,0,0,0,0,0,0,21,332,tt_content,image,1,sys_file,[Translate to Dansk:] Taken at T3BOARD,,,
-,131,89,24,0,1,0,0,0,0,0,0,0,1,332,tt_content,image,2,sys_file,[Translate to Dansk:] This is Kasper,,,
+,126,89,0,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,
+,127,89,0,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,
+,128,89,0,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,Taken at T3BOARD,,,
+,129,89,0,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,This is Kasper,,,
+,130,89,0,0,1,0,0,0,0,0,0,0,21,332,tt_content,image,1,sys_file,[Translate to Dansk:] Taken at T3BOARD,,,
+,131,89,0,0,1,0,0,0,0,0,0,0,1,332,tt_content,image,2,sys_file,[Translate to Dansk:] This is Kasper,,,
 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,,,,,,,,
 ,330,89,256,0,0,0,0,0,0,0,0,0,Regular Element #1,2,,,,,,,,
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 54bd7649e89b..3f6898b2e3de 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
@@ -1,10 +1,10 @@
 "sys_file_reference",,,,,,,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
-,126,89,128,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
-,127,89,64,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
-,128,89,32,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
-,129,89,16,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
-,130,89,8,0,0,0,0,0,0,0,0,0,1,332,"tt_content","image",1,"sys_file","Image #1",,,
+,126,89,0,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
+,127,89,0,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
+,128,89,0,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
+,129,89,0,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
+,130,89,0,0,0,0,0,0,0,0,0,0,1,332,"tt_content","image",1,"sys_file","Image #1",,,
 "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",,,,,,,,
 ,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,
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 e43942535555..84dc7c750be4 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
@@ -1,9 +1,9 @@
 "sys_file_reference",,,,,,,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
-,126,89,128,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
-,127,89,64,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
-,128,89,1000000000,1,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
-,129,89,1000000000,1,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
+,126,89,0,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
+,127,89,0,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
+,128,89,0,1,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
+,129,89,0,1,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
 "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",,,,,,,,
 ,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,
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 cb64f50d7947..b3acadcc29bc 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
@@ -1,11 +1,11 @@
 "sys_file_reference",,,,,,,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
-,126,89,128,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
-,127,89,64,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
-,128,89,32,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
-,129,89,16,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
-,130,89,48,0,1,128,0,0,0,0,0,0,21,332,"tt_content","image",1,"sys_file","[Translate to Dansk:] Taken at T3BOARD",,,
-,131,89,24,0,1,129,0,0,0,0,0,0,1,332,"tt_content","image",2,"sys_file","[Translate to Dansk:] This is Kasper",,,
+,126,89,0,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
+,127,89,0,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
+,128,89,0,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
+,129,89,0,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
+,130,89,0,0,1,128,0,0,0,0,0,0,21,332,"tt_content","image",1,"sys_file","[Translate to Dansk:] Taken at T3BOARD",,,
+,131,89,0,0,1,129,0,0,0,0,0,0,1,332,"tt_content","image",2,"sys_file","[Translate to Dansk:] This is Kasper",,,
 "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",,,,,,,,
 ,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,
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 da6858cd70f9..ecaa2a37a2db 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
@@ -1,9 +1,9 @@
 "sys_file_reference",,,,,,,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
-,126,89,128,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
-,127,89,64,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
-,128,89,32,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
-,129,89,16,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
+,126,89,0,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
+,127,89,0,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
+,128,89,0,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
+,129,89,0,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
 "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",,,,,,,,
 ,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,
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 327458691f3f..85f79417a045 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
@@ -1,10 +1,10 @@
 "sys_file_reference",,,,,,,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
-,126,89,128,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
-,127,89,64,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
-,128,89,32,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
-,129,89,16,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
-,130,89,8,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",3,"sys_file","Image #3",,,
+,126,89,0,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
+,127,89,0,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
+,128,89,0,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
+,129,89,0,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
+,130,89,0,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",3,"sys_file","Image #3",,,
 "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",,,,,,,,
 ,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,
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 f9aa75e6f8cb..66bac1d99e9a 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
@@ -1,9 +1,9 @@
 "sys_file_reference",,,,,,,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
-,126,89,128,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
-,127,89,64,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
-,128,89,1000000000,1,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
-,129,89,1000000000,1,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
+,126,89,0,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
+,127,89,0,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
+,128,89,0,1,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
+,129,89,0,1,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
 "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",,,,,,,,
 ,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,
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 3f5844cd2dba..b0546e16ab02 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
@@ -1,9 +1,9 @@
 "sys_file_reference",,,,,,,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
-,126,89,128,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
-,127,89,64,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
-,128,89,1000000000,1,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
-,129,89,16,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",1,"sys_file","This is Kasper",,,
+,126,89,0,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
+,127,89,0,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
+,128,89,0,1,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
+,129,89,0,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",1,"sys_file","This is Kasper",,,
 "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",,,,,,,,
 ,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,
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 89dfadef76c9..7102735aea45 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
@@ -1,9 +1,9 @@
 "sys_file_reference",,,,,,,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
-,126,89,128,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
-,127,89,64,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
-,128,89,32,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
-,129,89,16,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","Image #1",,,
+,126,89,0,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
+,127,89,0,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
+,128,89,0,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
+,129,89,0,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","Image #1",,,
 "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",,,,,,,,
 ,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,
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 d3e5889e372c..4ec50cdde221 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
@@ -1,9 +1,9 @@
 "sys_file_reference",,,,,,,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
-,126,89,128,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
-,127,89,64,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
-,128,90,128,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
-,129,90,256,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
+,126,89,0,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
+,127,89,0,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
+,128,90,0,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
+,129,90,0,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
 "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",,,,,,,,
 ,330,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,
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 4f1687a2d518..f8ba9b7ee94b 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
@@ -1,9 +1,9 @@
 "sys_file_reference",,,,,,,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","uid_local","uid_foreign","tablenames","fieldname","sorting_foreign","table_local","title","description","alternative","link"
-,126,90,64,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
-,127,90,32,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
-,128,90,128,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
-,129,90,256,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
+,126,90,0,0,0,0,0,0,0,0,0,0,1,330,"tt_content","image",2,"sys_file","T3BOARD",,,
+,127,90,0,0,0,0,0,0,0,0,0,0,21,330,"tt_content","image",1,"sys_file","Kasper",,,
+,128,90,0,0,0,0,0,0,0,0,0,0,21,331,"tt_content","image",1,"sys_file","Taken at T3BOARD",,,
+,129,90,0,0,0,0,0,0,0,0,0,0,1,331,"tt_content","image",2,"sys_file","This is Kasper",,,
 "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",,,,,,,,
 ,330,90,512,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,,,,
diff --git a/typo3/sysext/frontend/Tests/Functional/Rendering/DataSet/LiveDefaultElements.csv b/typo3/sysext/frontend/Tests/Functional/Rendering/DataSet/LiveDefaultElements.csv
index 17d8166db98e..84ff7cca9100 100644
--- a/typo3/sysext/frontend/Tests/Functional/Rendering/DataSet/LiveDefaultElements.csv
+++ b/typo3/sysext/frontend/Tests/Functional/Rendering/DataSet/LiveDefaultElements.csv
@@ -33,9 +33,9 @@ sys_file_metadata,,,,,,,,,,,,,,,,,,,,,,,
 ,21,0,0,0,0,0,0,0,0,0,21,Image T3BOARD,1024,683,,,0,,,,,,
 sys_file_reference,,,,,,,,,,,,,,,,,,,,,,,
 ,uid,pid,title,uid_local,uid_foreign,sys_language_uid,l10n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,sorting,deleted,tablenames,fieldname,sorting_foreign,table_local,description,alternative,link,l10n_diffsource
-,126,89,T3BOARD,1,297,0,0,0,0,0,0,0,0,128,0,tt_content,image,2,sys_file,,,,
-,127,89,Kasper,21,298,0,0,0,0,0,0,0,0,64,0,tt_content,image,1,sys_file,,,,
-,128,89,[Kasper] Image translated to Dansk,21,300,1,127,127,0,0,0,0,0,32,0,tt_content,image,1,sys_file,,,,
-,129,89,[T3BOARD] Image added in Dansk (without parent),1,300,1,0,0,0,0,0,0,0,16,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,8,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,8,0,tt_content,image,1,sys_file,,,,
+,126,89,T3BOARD,1,297,0,0,0,0,0,0,0,0,0,0,tt_content,image,2,sys_file,,,,
+,127,89,Kasper,21,298,0,0,0,0,0,0,0,0,0,0,tt_content,image,1,sys_file,,,,
+,128,89,[Kasper] Image translated to Dansk,21,300,1,127,127,0,0,0,0,0,0,0,tt_content,image,1,sys_file,,,,
+,129,89,[T3BOARD] Image added in Dansk (without parent),1,300,1,0,0,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,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,0,0,tt_content,image,1,sys_file,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/DataSet/LiveDefaultElements.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/DataSet/LiveDefaultElements.csv
index 09243dcd1ea1..5ba48af90b1d 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/DataSet/LiveDefaultElements.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/DataSet/LiveDefaultElements.csv
@@ -25,10 +25,10 @@ sys_file_metadata
 ,21,0,0,0,0,0,0,0,0,21,"Image T3BOARD",1024,683,,,0,
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link,l10n_diffsource
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,"T3BOARD",,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,"Kasper",,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,"T3BOARD",,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,"Kasper",,,,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/changeContentSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/changeContentSorting.csv
index 0ea4295eece1..19938e849936 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/changeContentSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/changeContentSorting.csv
@@ -1,13 +1,13 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,-1,64,0,0,0,1,4,0,127,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,131,-1,128,0,0,0,1,4,0,126,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,132,89,8,0,0,0,1,3,0,0,127,0,330,tt_content,image,0,sys_file,,,,,
-,133,89,4,0,0,0,1,3,0,0,126,0,330,tt_content,image,0,sys_file,,,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,-1,0,0,0,0,1,4,0,127,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,131,-1,0,0,0,0,1,4,0,126,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,132,89,0,0,0,0,1,3,0,0,127,0,330,tt_content,image,0,sys_file,,,,,
+,133,89,0,0,0,0,1,3,0,0,126,0,330,tt_content,image,0,sys_file,,,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/copyContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/copyContent.csv
index 307ab85f5cc9..a5493f29b908 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/copyContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/copyContent.csv
@@ -1,13 +1,13 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,89,8,0,0,0,1,1,0,0,0,21,332,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,131,-1,8,0,0,0,1,-1,0,130,0,21,332,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,132,89,4,0,0,0,1,1,0,0,0,1,332,tt_content,image,2,sys_file,"This is Kasper",,,,
-,133,-1,4,0,0,0,1,-1,0,132,0,1,332,tt_content,image,2,sys_file,"This is Kasper",,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,89,0,0,0,0,1,1,0,0,0,21,332,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,131,-1,0,0,0,0,1,-1,0,130,0,21,332,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,132,89,0,0,0,0,1,1,0,0,0,1,332,tt_content,image,2,sys_file,"This is Kasper",,,,
+,133,-1,0,0,0,0,1,-1,0,132,0,1,332,tt_content,image,2,sys_file,"This is Kasper",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/createContentWFileReference.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/createContentWFileReference.csv
index e3d25f509149..cb0ed0435162 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/createContentWFileReference.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/createContentWFileReference.csv
@@ -1,11 +1,11 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,89,8,0,0,0,1,1,0,0,0,1,332,tt_content,image,1,sys_file,"Image #1",,,,
-,131,-1,8,0,0,0,1,-1,0,130,0,1,332,tt_content,image,1,sys_file,"Image #1",,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,89,0,0,0,0,1,1,0,0,0,1,332,tt_content,image,1,sys_file,"Image #1",,,,
+,131,-1,0,0,0,0,1,-1,0,130,0,1,332,tt_content,image,1,sys_file,"Image #1",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/deleteContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/deleteContent.csv
index 66750b16149e..8e5df2a12117 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/deleteContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/deleteContent.csv
@@ -1,11 +1,11 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,-1,32,0,0,0,1,2,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,131,-1,16,0,0,0,1,2,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,-1,0,0,0,0,1,2,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,131,-1,0,0,0,0,1,2,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/localizeContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/localizeContent.csv
index f80d837114b5..3c75d7752654 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/localizeContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/localizeContent.csv
@@ -1,13 +1,13 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,89,48,0,1,128,1,1,0,0,0,21,332,tt_content,image,1,sys_file,"[Translate to Dansk:] Taken at T3BOARD",,,,
-,131,-1,48,0,1,128,1,-1,0,130,0,21,332,tt_content,image,1,sys_file,"[Translate to Dansk:] Taken at T3BOARD",,,,
-,132,89,24,0,1,129,1,1,0,0,0,1,332,tt_content,image,2,sys_file,"[Translate to Dansk:] This is Kasper",,,,
-,133,-1,24,0,1,129,1,-1,0,132,0,1,332,tt_content,image,2,sys_file,"[Translate to Dansk:] This is Kasper",,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,89,0,0,1,128,1,1,0,0,0,21,332,tt_content,image,1,sys_file,"[Translate to Dansk:] Taken at T3BOARD",,,,
+,131,-1,0,0,1,128,1,-1,0,130,0,21,332,tt_content,image,1,sys_file,"[Translate to Dansk:] Taken at T3BOARD",,,,
+,132,89,0,0,1,129,1,1,0,0,0,1,332,tt_content,image,2,sys_file,"[Translate to Dansk:] This is Kasper",,,,
+,133,-1,0,0,1,129,1,-1,0,132,0,1,332,tt_content,image,2,sys_file,"[Translate to Dansk:] This is Kasper",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContent.csv
index 98d3642215fb..b98001c97569 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContent.csv
@@ -1,11 +1,11 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,-1,32,0,0,0,1,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,131,-1,16,0,0,0,1,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,-1,0,0,0,0,1,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,131,-1,0,0,0,0,1,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNAddFileReference.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNAddFileReference.csv
index ad0b08ef64e6..dfa522064e51 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNAddFileReference.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNAddFileReference.csv
@@ -1,13 +1,13 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,-1,32,0,0,0,1,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,131,-1,16,0,0,0,1,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,132,89,8,0,0,0,1,1,0,0,0,1,331,tt_content,image,3,sys_file,"Image #3",,,,
-,133,-1,8,0,0,0,1,-1,0,132,0,1,331,tt_content,image,3,sys_file,"Image #3",,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,-1,0,0,0,0,1,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,131,-1,0,0,0,0,1,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,132,89,0,0,0,0,1,1,0,0,0,1,331,tt_content,image,3,sys_file,"Image #3",,,,
+,133,-1,0,0,0,0,1,-1,0,132,0,1,331,tt_content,image,3,sys_file,"Image #3",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteAllFileReference.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteAllFileReference.csv
index 7ee58f5736f0..8a74d48e89fa 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteAllFileReference.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteAllFileReference.csv
@@ -1,11 +1,11 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,-1,16,0,0,0,1,2,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,131,-1,32,0,0,0,1,2,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,-1,0,0,0,0,1,2,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,131,-1,0,0,0,0,1,2,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteFileReference.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteFileReference.csv
index e6e2b656f021..6b08012a95be 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteFileReference.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentNDeleteFileReference.csv
@@ -1,11 +1,11 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,-1,16,0,0,0,1,0,0,129,0,1,331,tt_content,image,1,sys_file,"This is Kasper",,,,
-,131,-1,32,0,0,0,1,2,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,-1,0,0,0,0,1,0,0,129,0,1,331,tt_content,image,1,sys_file,"This is Kasper",,,,
+,131,-1,0,0,0,0,1,2,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentWFileReference.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentWFileReference.csv
index 995e0dec4c30..1231382109f8 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentWFileReference.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/modifyContentWFileReference.csv
@@ -1,11 +1,11 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,-1,32,0,0,0,1,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,131,-1,16,0,0,0,1,0,0,129,0,1,331,tt_content,image,2,sys_file,"Image #1",,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,-1,0,0,0,0,1,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,131,-1,0,0,0,0,1,0,0,129,0,1,331,tt_content,image,2,sys_file,"Image #1",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/moveContentToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/moveContentToDifferentPage.csv
index 6ceb308f7030..07612e030804 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/moveContentToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/moveContentToDifferentPage.csv
@@ -1,13 +1,13 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,-1,32,0,0,0,1,4,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,131,-1,16,0,0,0,1,4,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,132,90,256,0,0,0,1,3,0,0,128,0,331,tt_content,image,0,sys_file,,,,,
-,133,90,128,0,0,0,1,3,0,0,129,0,331,tt_content,image,0,sys_file,,,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,-1,0,0,0,0,1,4,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,131,-1,0,0,0,0,1,4,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,132,90,0,0,0,0,1,3,0,0,128,0,331,tt_content,image,0,sys_file,,,,,
+,133,90,0,0,0,0,1,3,0,0,129,0,331,tt_content,image,0,sys_file,,,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/moveContentToDifferentPageNChangeSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/moveContentToDifferentPageNChangeSorting.csv
index b93526bbe6ec..61e75e9087c3 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/moveContentToDifferentPageNChangeSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/DataSet/moveContentToDifferentPageNChangeSorting.csv
@@ -1,17 +1,17 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,-1,32,0,0,0,1,4,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,131,-1,16,0,0,0,1,4,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,132,90,256,0,0,0,1,3,0,0,128,0,331,tt_content,image,0,sys_file,,,,,
-,133,90,128,0,0,0,1,3,0,0,129,0,331,tt_content,image,0,sys_file,,,,,
-,134,-1,64,0,0,0,1,4,0,127,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,135,-1,128,0,0,0,1,4,0,126,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,136,90,64,0,0,0,1,3,0,0,127,0,330,tt_content,image,0,sys_file,,,,,
-,137,90,32,0,0,0,1,3,0,0,126,0,330,tt_content,image,0,sys_file,,,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,-1,0,0,0,0,1,4,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,131,-1,0,0,0,0,1,4,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,132,90,0,0,0,0,1,3,0,0,128,0,331,tt_content,image,0,sys_file,,,,,
+,133,90,0,0,0,0,1,3,0,0,129,0,331,tt_content,image,0,sys_file,,,,,
+,134,-1,0,0,0,0,1,4,0,127,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,135,-1,0,0,0,0,1,4,0,126,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,136,90,0,0,0,0,1,3,0,0,127,0,330,tt_content,image,0,sys_file,,,,,
+,137,90,0,0,0,0,1,3,0,0,126,0,330,tt_content,image,0,sys_file,,,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/changeContentSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/changeContentSorting.csv
index 131ec7808016..074fb7e729d6 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/changeContentSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/changeContentSorting.csv
@@ -1,11 +1,11 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,4,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,8,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,-1,64,0,0,0,0,0,0,127,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,131,-1,128,0,0,0,0,0,0,126,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,-1,0,0,0,0,0,0,0,127,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,131,-1,0,0,0,0,0,0,0,126,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,768,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/copyContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/copyContent.csv
index 1f26b8abe5ad..fd22dbc804e8 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/copyContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/copyContent.csv
@@ -1,11 +1,11 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,89,8,0,0,0,0,0,0,0,0,21,332,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,132,89,4,0,0,0,0,0,0,0,0,1,332,tt_content,image,2,sys_file,"This is Kasper",,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,89,0,0,0,0,0,0,0,0,0,21,332,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,132,89,0,0,0,0,0,0,0,0,0,1,332,tt_content,image,2,sys_file,"This is Kasper",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/createContentWFileReference.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/createContentWFileReference.csv
index 9d444400eba6..b174300656cc 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/createContentWFileReference.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/createContentWFileReference.csv
@@ -1,10 +1,10 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,89,8,0,0,0,0,0,0,0,0,1,332,tt_content,image,1,sys_file,"Image #1",,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,89,0,0,0,0,0,0,0,0,0,1,332,tt_content,image,1,sys_file,"Image #1",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/deleteContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/deleteContent.csv
index 1eb141292c05..890c6bb0e0f3 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/deleteContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/deleteContent.csv
@@ -1,11 +1,11 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,1000000000,1,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,1000000000,1,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,-1,1000000000,1,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,131,-1,1000000000,1,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,1,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,1,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,-1,0,1,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,131,-1,0,1,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/localizeContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/localizeContent.csv
index de071d4339cf..66f6472cb0e9 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/localizeContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/localizeContent.csv
@@ -1,11 +1,11 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,89,48,0,1,128,0,0,0,0,0,21,332,tt_content,image,1,sys_file,"[Translate to Dansk:] Taken at T3BOARD",,,,
-,132,89,24,0,1,129,0,0,0,0,0,1,332,tt_content,image,2,sys_file,"[Translate to Dansk:] This is Kasper",,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,89,0,0,1,128,0,0,0,0,0,21,332,tt_content,image,1,sys_file,"[Translate to Dansk:] Taken at T3BOARD",,,,
+,132,89,0,0,1,129,0,0,0,0,0,1,332,tt_content,image,2,sys_file,"[Translate to Dansk:] This is Kasper",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/modifyContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/modifyContent.csv
index 09e29aaf2696..840d0fc0c96f 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/modifyContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/modifyContent.csv
@@ -1,11 +1,11 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,-1,32,0,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,131,-1,16,0,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,-1,0,0,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,131,-1,0,0,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/modifyContentNAddFileReference.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/modifyContentNAddFileReference.csv
index 5e03139f69a7..635269f452d6 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/modifyContentNAddFileReference.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/modifyContentNAddFileReference.csv
@@ -1,12 +1,12 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,-1,32,0,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,131,-1,16,0,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,132,89,8,0,0,0,0,0,0,0,0,1,331,tt_content,image,3,sys_file,"Image #3",,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,-1,0,0,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,131,-1,0,0,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,132,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,3,sys_file,"Image #3",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/modifyContentNDeleteAllFileReference.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/modifyContentNDeleteAllFileReference.csv
index 7ea57d3a435d..d1d17ec6ecd3 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/modifyContentNDeleteAllFileReference.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/modifyContentNDeleteAllFileReference.csv
@@ -1,11 +1,11 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,1000000000,1,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,1000000000,1,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,-1,1000000000,1,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,131,-1,1000000000,1,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,1,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,1,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,-1,0,1,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,131,-1,0,1,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/modifyContentNDeleteFileReference.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/modifyContentNDeleteFileReference.csv
index ad845cc825a9..64dde0ce48a4 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/modifyContentNDeleteFileReference.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/modifyContentNDeleteFileReference.csv
@@ -1,11 +1,11 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,1000000000,1,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,1,sys_file,"This is Kasper",,,,
-,130,-1,16,0,0,0,0,0,0,129,0,1,331,tt_content,image,1,sys_file,"This is Kasper",,,,
-,131,-1,1000000000,1,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,1,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,1,sys_file,"This is Kasper",,,,
+,130,-1,0,0,0,0,0,0,0,129,0,1,331,tt_content,image,1,sys_file,"This is Kasper",,,,
+,131,-1,0,1,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/modifyContentWFileReference.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/modifyContentWFileReference.csv
index fc6eb6b46e9b..59a8ed40237d 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/modifyContentWFileReference.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/modifyContentWFileReference.csv
@@ -1,11 +1,11 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"Image #1",,,,
-,130,-1,32,0,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,131,-1,16,0,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"Image #1",,,,
+,130,-1,0,0,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,131,-1,0,0,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/moveContentToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/moveContentToDifferentPage.csv
index 2502a65454b5..cd8b5c9a2a3b 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/moveContentToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/moveContentToDifferentPage.csv
@@ -1,11 +1,11 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,90,256,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,90,128,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,-1,32,0,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,131,-1,16,0,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,90,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,90,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,-1,0,0,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,131,-1,0,0,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/moveContentToDifferentPageNChangeSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/moveContentToDifferentPageNChangeSorting.csv
index 2e6f2bd112e2..e169731b4ef6 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/moveContentToDifferentPageNChangeSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/DataSet/moveContentToDifferentPageNChangeSorting.csv
@@ -1,13 +1,13 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,90,32,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,90,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,90,256,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,90,128,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,-1,32,0,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,131,-1,16,0,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,134,-1,64,0,0,0,0,0,0,127,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,135,-1,128,0,0,0,0,0,0,126,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,126,90,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,90,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,90,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,90,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,-1,0,0,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,131,-1,0,0,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,134,-1,0,0,0,0,0,0,0,127,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,135,-1,0,0,0,0,0,0,0,126,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,90,512,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/changeContentSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/changeContentSorting.csv
index 131ec7808016..074fb7e729d6 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/changeContentSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/changeContentSorting.csv
@@ -1,11 +1,11 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,4,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,8,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,-1,64,0,0,0,0,0,0,127,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,131,-1,128,0,0,0,0,0,0,126,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,-1,0,0,0,0,0,0,0,127,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,131,-1,0,0,0,0,0,0,0,126,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,768,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/copyContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/copyContent.csv
index 1f26b8abe5ad..fd22dbc804e8 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/copyContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/copyContent.csv
@@ -1,11 +1,11 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,89,8,0,0,0,0,0,0,0,0,21,332,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,132,89,4,0,0,0,0,0,0,0,0,1,332,tt_content,image,2,sys_file,"This is Kasper",,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,89,0,0,0,0,0,0,0,0,0,21,332,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,132,89,0,0,0,0,0,0,0,0,0,1,332,tt_content,image,2,sys_file,"This is Kasper",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/createContentWFileReference.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/createContentWFileReference.csv
index 9d444400eba6..b174300656cc 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/createContentWFileReference.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/createContentWFileReference.csv
@@ -1,10 +1,10 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,89,8,0,0,0,0,0,0,0,0,1,332,tt_content,image,1,sys_file,"Image #1",,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,89,0,0,0,0,0,0,0,0,0,1,332,tt_content,image,1,sys_file,"Image #1",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/deleteContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/deleteContent.csv
index 1eb141292c05..890c6bb0e0f3 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/deleteContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/deleteContent.csv
@@ -1,11 +1,11 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,1000000000,1,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,1000000000,1,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,-1,1000000000,1,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,131,-1,1000000000,1,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,1,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,1,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,-1,0,1,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,131,-1,0,1,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/localizeContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/localizeContent.csv
index de071d4339cf..66f6472cb0e9 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/localizeContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/localizeContent.csv
@@ -1,11 +1,11 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,89,48,0,1,128,0,0,0,0,0,21,332,tt_content,image,1,sys_file,"[Translate to Dansk:] Taken at T3BOARD",,,,
-,132,89,24,0,1,129,0,0,0,0,0,1,332,tt_content,image,2,sys_file,"[Translate to Dansk:] This is Kasper",,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,89,0,0,1,128,0,0,0,0,0,21,332,tt_content,image,1,sys_file,"[Translate to Dansk:] Taken at T3BOARD",,,,
+,132,89,0,0,1,129,0,0,0,0,0,1,332,tt_content,image,2,sys_file,"[Translate to Dansk:] This is Kasper",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/modifyContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/modifyContent.csv
index 09e29aaf2696..840d0fc0c96f 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/modifyContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/modifyContent.csv
@@ -1,11 +1,11 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,-1,32,0,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,131,-1,16,0,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,-1,0,0,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,131,-1,0,0,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/modifyContentNAddFileReference.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/modifyContentNAddFileReference.csv
index 5e03139f69a7..635269f452d6 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/modifyContentNAddFileReference.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/modifyContentNAddFileReference.csv
@@ -1,12 +1,12 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,-1,32,0,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,131,-1,16,0,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,132,89,8,0,0,0,0,0,0,0,0,1,331,tt_content,image,3,sys_file,"Image #3",,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,-1,0,0,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,131,-1,0,0,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,132,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,3,sys_file,"Image #3",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/modifyContentNDeleteAllFileReference.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/modifyContentNDeleteAllFileReference.csv
index 7ea57d3a435d..d1d17ec6ecd3 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/modifyContentNDeleteAllFileReference.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/modifyContentNDeleteAllFileReference.csv
@@ -1,11 +1,11 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,1000000000,1,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,1000000000,1,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,-1,1000000000,1,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,131,-1,1000000000,1,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,1,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,1,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,-1,0,1,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,131,-1,0,1,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/modifyContentNDeleteFileReference.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/modifyContentNDeleteFileReference.csv
index ad845cc825a9..64dde0ce48a4 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/modifyContentNDeleteFileReference.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/modifyContentNDeleteFileReference.csv
@@ -1,11 +1,11 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,1000000000,1,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,1,sys_file,"This is Kasper",,,,
-,130,-1,16,0,0,0,0,0,0,129,0,1,331,tt_content,image,1,sys_file,"This is Kasper",,,,
-,131,-1,1000000000,1,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,1,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,1,sys_file,"This is Kasper",,,,
+,130,-1,0,0,0,0,0,0,0,129,0,1,331,tt_content,image,1,sys_file,"This is Kasper",,,,
+,131,-1,0,1,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/modifyContentWFileReference.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/modifyContentWFileReference.csv
index fc6eb6b46e9b..59a8ed40237d 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/modifyContentWFileReference.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/modifyContentWFileReference.csv
@@ -1,11 +1,11 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,89,32,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,89,16,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"Image #1",,,,
-,130,-1,32,0,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,131,-1,16,0,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,89,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,89,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"Image #1",,,,
+,130,-1,0,0,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,131,-1,0,0,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/moveContentToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/moveContentToDifferentPage.csv
index 2502a65454b5..cd8b5c9a2a3b 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/moveContentToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/moveContentToDifferentPage.csv
@@ -1,11 +1,11 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,89,128,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,89,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,90,256,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,90,128,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,-1,32,0,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,131,-1,16,0,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,126,89,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,89,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,90,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,90,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,-1,0,0,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,131,-1,0,0,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/moveContentToDifferentPageNChangeSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/moveContentToDifferentPageNChangeSorting.csv
index 2e6f2bd112e2..e169731b4ef6 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/moveContentToDifferentPageNChangeSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/DataSet/moveContentToDifferentPageNChangeSorting.csv
@@ -1,13 +1,13 @@
 sys_file_reference
 ,uid,pid,sorting,deleted,sys_language_uid,l10n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,uid_local,uid_foreign,tablenames,fieldname,sorting_foreign,table_local,title,description,alternative,link
-,126,90,32,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
-,127,90,64,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,128,90,256,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,129,90,128,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,130,-1,32,0,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
-,131,-1,16,0,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
-,134,-1,64,0,0,0,0,0,0,127,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
-,135,-1,128,0,0,0,0,0,0,126,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,126,90,0,0,0,0,0,0,0,0,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
+,127,90,0,0,0,0,0,0,0,0,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,128,90,0,0,0,0,0,0,0,0,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,129,90,0,0,0,0,0,0,0,0,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,130,-1,0,0,0,0,0,0,0,128,0,21,331,tt_content,image,1,sys_file,"Taken at T3BOARD",,,,
+,131,-1,0,0,0,0,0,0,0,129,0,1,331,tt_content,image,2,sys_file,"This is Kasper",,,,
+,134,-1,0,0,0,0,0,0,0,127,0,21,330,tt_content,image,1,sys_file,Kasper,,,,
+,135,-1,0,0,0,0,0,0,0,126,0,1,330,tt_content,image,2,sys_file,T3BOARD,,,,
 tt_content
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image
 ,330,90,512,0,0,0,0,0,0,0,0,"Regular Element #1",2
-- 
GitLab