Merge "Prepare to make origin list mutable" into sc-dev