[TASK] Improve CGL

Change-Id: Idf784454b64942ecd690381a5c8eab9cf737dceb
Reviewed-on: https://review.typo3.org/28029
Reviewed-by: Georg Ringer
Tested-by: Georg Ringer