diff --git a/typo3/sysext/core/Configuration/TCA/sys_file_reference.php b/typo3/sysext/core/Configuration/TCA/sys_file_reference.php
index 001247e81c2c0c9d62e0a3e833cfc6a5e73431b5..ccecd6163237bfe3a52a39b5448e43d96cd1946e 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 7ee71c28fb2a3cee4422e208063a4be46dbe0df5..75fa7f37a444f8bbef27b7ed08352d1c83dd70ec 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 59b49dcd5386d829a62fba77fc378c246c72af22..92540158cb7d1ebb9f2e09a3f7a18608ee8e3029 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 86e4d78bae108438b6dc64430c175adbc18edfae..3d81e92e137d5bddf7a0f028c4e00c7576f4ada6 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 d8f00fd9b64360eead1bda0dae873b03f2bb0b07..f4defbe274351ad43b8e3717cee29ec9b0fb388c 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 54bd7649e89b24a60e80289cd41f31d4647c157c..3f6898b2e3de50d0129376b9a6a33510663eb14b 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 e43942535555834a36e0f44fabcf8a38ceb8e261..84dc7c750be4dd0efbb3f8ce381d31e326714192 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 cb64f50d79476c7e7b5b7179fe27d355e8db559a..b3acadcc29bcba9ea9cb2ccbf66d789bdd7f5b5a 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 da6858cd70f91b03ac233f95ff87aac8d304a4aa..ecaa2a37a2db5322ee594393196b562f467c60a9 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 327458691f3f0f38410fa88170f53c9ad8cf8483..85f79417a045c524914c9e22fa6b3cb45079df7d 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 f9aa75e6f8cb62233cb96a81dd2e41267ff70c8f..66bac1d99e9af9bc914292111b5b35c7dc5e8ecc 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 3f5844cd2dba210140aa2b4fbde86befd7985a01..b0546e16ab022a038c22138e03294357d448843f 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 89dfadef76c916d9da5f50d81e63121f3e8d0e66..7102735aea4567b56ee3b74c675cce20cb90e567 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 d3e5889e372cf6dbe7f7403c18df62090034db6f..4ec50cdde2216163ce79ef84a5fe05b6f4b7dc29 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 4f1687a2d5186dc899242a5ee2bdce85942d77e0..f8ba9b7ee94bfe456cea7d1c48b162b4a0ac5c7c 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 17d8166db98e72318249542f06f817292db59812..84ff7cca9100811684062fb8751e969d6ff4e154 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 09243dcd1ea1ef721731eaa53966f9ca9634d7dd..5ba48af90b1df0c183785aa4acd0ca4374d81a46 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 0ea4295eece1e7aa54d8ab55403c71053f64a3a6..19938e849936919f26a545c06c30893a37f34d54 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 307ab85f5cc99161eed5b76354507c22432fb0b6..a5493f29b908563b3b4b4398f4ab2d36b922bcc4 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 e3d25f509149b45d05b7e8b0d38d621d67d5b5c5..cb0ed0435162d647a73b54f27adf0d2761c532cd 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 66750b16149e5da20cd9a603953467f5585cb115..8e5df2a12117cd87180dd2cc3972bdbf5da2c631 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 f80d837114b5f00fa150b3f65460a4e5552d04fc..3c75d77526548751d30d535d519dec43f81a1530 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 98d3642215fb4092b6e4ca9f6befa5f982e88b43..b98001c975694614a29d31f8836ce4a8f44bb598 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 ad0b08ef64e6611db5eaf9e25b3f6600421c019b..dfa522064e51c523ce08d6c642cfbdffcace2b8a 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 7ee58f5736f08444b874a91187d68cc303da228a..8a74d48e89faf9367a48b2d60cdf3173fa30ed2a 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 e6e2b656f0215efa51a9ab2f31d52336c7e5f541..6b08012a95becb748cd8fcf00f490721b9da2ca4 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 995e0dec4c30831dfd89e24cab130212139b5b01..1231382109f8b65b4139d33981c7d2bb7f85f4ff 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 6ceb308f7030d7231292b09929b429315391d7e8..07612e030804f50e25cbb9fc8e5698c0bfa1885f 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 b93526bbe6ecaaed1dd639d5fd8c8f43a4899e0e..61e75e9087c30dc553797dc2c1c691d4043a6dbb 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 131ec7808016123b51e69ab178ac31ab09262392..074fb7e729d63363ea6339ff9a74ac532f7afb51 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 1f26b8abe5ade577a4ff05845e6c87a7987606e8..fd22dbc804e84553d5c9c719854d2a0847c17cc8 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 9d444400eba6150982054a2300b986170098ad28..b174300656ccfb0c6171e7e2f9f7573bbd853d11 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 1eb141292c051b73fb03c5da1a4f263fd7d1ca94..890c6bb0e0f3f24bae4dd5997a6bc0c269d4d8b2 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 de071d4339cf59dea603bf91cda1010fb5babd9f..66f6472cb0e97fa23842cb7bc40e81ed93686625 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 09e29aaf2696a44264814dfd56866529ceebaeb5..840d0fc0c96fd30d768b3758d4f4309ff136a575 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 5e03139f69a7854ac13d26e95d64eb8fa7ad3c9d..635269f452d6df76a635d1800f16c60662249d60 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 7ea57d3a435dc2448795e4cd716e59f85b79a99c..d1d17ec6ecd30c01831d120b11ab5b0fde12bb36 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 ad845cc825a91cdb4013b9f76010d77cf9dc3667..64dde0ce48a48c2c6f25e70068fbf0ee3293626b 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 fc6eb6b46e9b155458f4686b987432eae5793914..59a8ed40237d57636990a1c78898a1645763bb98 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 2502a65454b5c2536804d44ee1b6d4e73c924171..cd8b5c9a2a3bca1aab9881107a5809e84a6f21d1 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 2e6f2bd112e23330cbfd4a722c5f292002104cf9..e169731b4ef67094c4044eadaf5e23364ff2d305 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 131ec7808016123b51e69ab178ac31ab09262392..074fb7e729d63363ea6339ff9a74ac532f7afb51 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 1f26b8abe5ade577a4ff05845e6c87a7987606e8..fd22dbc804e84553d5c9c719854d2a0847c17cc8 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 9d444400eba6150982054a2300b986170098ad28..b174300656ccfb0c6171e7e2f9f7573bbd853d11 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 1eb141292c051b73fb03c5da1a4f263fd7d1ca94..890c6bb0e0f3f24bae4dd5997a6bc0c269d4d8b2 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 de071d4339cf59dea603bf91cda1010fb5babd9f..66f6472cb0e97fa23842cb7bc40e81ed93686625 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 09e29aaf2696a44264814dfd56866529ceebaeb5..840d0fc0c96fd30d768b3758d4f4309ff136a575 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 5e03139f69a7854ac13d26e95d64eb8fa7ad3c9d..635269f452d6df76a635d1800f16c60662249d60 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 7ea57d3a435dc2448795e4cd716e59f85b79a99c..d1d17ec6ecd30c01831d120b11ab5b0fde12bb36 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 ad845cc825a91cdb4013b9f76010d77cf9dc3667..64dde0ce48a48c2c6f25e70068fbf0ee3293626b 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 fc6eb6b46e9b155458f4686b987432eae5793914..59a8ed40237d57636990a1c78898a1645763bb98 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 2502a65454b5c2536804d44ee1b6d4e73c924171..cd8b5c9a2a3bca1aab9881107a5809e84a6f21d1 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 2e6f2bd112e23330cbfd4a722c5f292002104cf9..e169731b4ef67094c4044eadaf5e23364ff2d305 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