Merge "Rollback the See More Intent for non-provider model design" into sc-dev