Fix some issues (#42, #44, #45, #46)
Merge remote-tracking branch 'origin/data_export_workpackage_03'