[CHG] Further improvements for TYPO3 7.0