Minor changes

Merged Marco Folco requested to merge minor_changes into 12.0-stage

Merge request reports