[TASK] Reapply direct changes of TYPO3 Core