Lasdinas fixes 8.0

Merged Luciano Ortiz requested to merge lasdinas-fixes-8.0 into 8.0-stage

Merge request reports