[TASK] Fixing CGL

Resolves: #52002
Releases: 3-1
Change-Id: Ifbb5f679b2ac06da8e9dcad3c014da4b1109cc51