Merge "Add a field for transport properties to RestoreSet object" into sc-dev