[Hotfix] FER-806