Merge "Deprecate obsolete provisioning extras" into sc-dev