Merge branch '268_fix_datasetblock_missing_output_handling' into 'master'

Fix DatasetBlock output handling

Closes #268

See merge request !137
5 jobs for master in 11 minutes and 37 seconds (queued for 5 seconds)