12.0 fixes

Merged Gastón Bertolani requested to merge 12.0-fixes into 12.0-stage

Merge request reports