Merge "Only lookup dataLoader when necessary." into sc-dev