Merge "move the fields in RouteSelectionDescriptorParams to RouteSelectionDescriptor" into sc-dev