[Hotfix] FER-860