BugFix: keep correct names for TimeSpans, so that they will be correct later on export
Merge branch 'DataLoadingUI'