Resolve LD15-24 LD15-43

Merged Luciano Ortiz requested to merge LD15-24.43 into 15.0-stage

Closes LD15-24

Edited by Luciano Ortiz

Merge request reports