Resolve SE-1065

Closed Javier Vescio requested to merge SE-1065 into 11.0-stage

Closes SE-1065

Merge request reports