Merge "[Provider Model] UI wording change" into sc-dev