[Hotfix] FER-840