8.0 refactoring

Merged Sebastian Kennedy requested to merge 8.0-refactoring into 8.0-stage

Merge request reports