Merge "Correct rebind to DataLoader after crash/death." into sc-dev