Merge "[TASK] Cleanup and small improvements to Interceptors"
drwxr-xr-x - typo3