[CHG] WIP Work on TYPO3 7.0 compatibility