Resolve SE-1376

Merged Jose Luis Zanotti requested to merge SE-1376 into 7.0

Closes SE-1376

Merge request reports