[MOD][T7409] Chage columns logic

Merged diego.barreto requested to merge T7409 into 12.0

Merge request reports