[MOD] changes

Merged Felipe requested to merge MOD-Changes into 12.0-stage

changes

Merge request reports