8.0 lsd 118 changes

Merged Gastón Bertolani requested to merge 8.0-lsd-118-changes into 8.0-stage

Merge request reports