[FIX]e-Resguardo fixes

Merged Gastón Bertolani requested to merge 8.0-resguardo-fixes into 8.0-stage

Merge request reports