12.0 patch

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

Merge request reports