[Hotfix] FER-829