[Hotfix] FOR-57