[Hotfix] FER-1150