[Hotfix] FER-629