Merge remote-tracking branch 'origin/lukas_issue144_feat_workflow-with-advanced-data-handling' into lukas_issue144_feat_workflow-with-advanced-data-handling