[FIX][LAB-233]Conflicts

Merged Gastón Bertolani requested to merge 12.0-fix-conflicts into 12.0

Merge request reports