DATALOADER changes
Merge remote-tracking branch 'origin/Jacob-2' into Lisbeth