Merge "Fix multiple control providers" into sc-dev