[GIGL-689] GIGL-689