fix bad inheritance

Merged Santiago Said requested to merge FixBadInheritance into 11.0-stage

Merge request reports