Resolve SE-1171

Merged Federico Pérez Diduch requested to merge SE-1171 into 8.0-stage

Closes SE-1171

Merge request reports