Merge "Bind provider services when necessary" into sc-dev