Review TER changes

https://review.typo3.org/#/c/50605/ https://review.typo3.org/#/c/50606/