[MOD] Changes to be fully v11 compliant

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

Merge request reports