8.0 inherit refactoring

Merged Gabriel Davini requested to merge 8.0-inherit_refactoring into 8.0-stage

Merge request reports