[FIX][LSD-119]Changes

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

Merge request reports