Merge "API feedback: make DataLoader API System." into sc-dev