Resolve LDS-149

Merged Santiago Said requested to merge LDS-149 into 8.0-stage

Closes LDS-149

Merge request reports