[Hotfix] FER-1089