[Hotfix] FER-784