11.0 three changes

Merged Gabriel Davini requested to merge 11.0-three_changes into 11.0-stage

Merge request reports