[FIX]Fields Colspan in picking

Merged Gastón Bertolani requested to merge 8.0-EXRA-14-fields-colspan into 8.0-stage

Closes EXRA-14

Merge request reports