Merge "[Provider Model] Enable Provider Model by default" into sc-dev