[Hotfix] GTI-268