[Hotfix] FER-897