8.0 add company

Merged Laureano Kloss requested to merge 8.0-AddCompany into 8.0-stage

Merge request reports