[T5682][ADD] multiple columns for locations

Merged Javier Vescio requested to merge T5682 into 17.0

Merge request reports