[Hotfix] FER-868 Export