[MOD] some changes

Merged Laureano Kloss requested to merge 12.0-stage into 12.0-dot91

Merge request reports