12.0 conflict

Merged Gastón Bertolani requested to merge 12.0-conflict into 12.0

Merge request reports