[Hotfix] FER-795