Merge "Reduce time spent waiting for a "dead" provider" into sc-dev