[Hotfix] FER-1022