set last directory of path as "filename" as fallback
Merge branch 'origin/DataLoadingUI'