Merge "Have BC use default provider rather than always BC"