[Hotfix] FER-752