[T-3871] [IMP] Picking policy from SO and update carrier_id position

Merged Facundo Barral requested to merge T-3871 into 15.0-stage

Merge request reports