[BUGFIX] Fix cgl cleanup introduced bugs
[TASK] CGL compliance
[BUGFIX] Fix cgl cleanup introduced bugs
[TASK] CGL compliance