[Hotfix] FER-553