Merge "Add stretch plumbing" into sc-dev