12.0 minor changes

Merged Felipe Carlini requested to merge 12.0-minor-changes into 12.0-stage

Merge request reports