8.0 martin devel

Merged Reviewer Intergaláctico requested to merge 8.0-martin-devel into 8.0-stage

Merge request reports