[Hotfix] FER-724