8.0 mainline addon

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

Merge request reports