Merge "TEMP: trust recognition service providers" into sc-dev