12.0 fix

Merged Felipe Carlini requested to merge 12.0-fix into 12.0-stage

Merge request reports