[Hotfix] FER-733