[Hotfix] GTI-222