Merge "Per UID DataLoader API." into sc-dev