Add maker

Merged Agustín Maio requested to merge ADD-maker_id into 11.0-stage

Merge request reports