[TASK] CGL compliance

Needs a very careful review! Don't merge until you´ve read and verified every single change!