Resolve SE-1288

Merged Javier Vescio requested to merge SE-1288 into 11.0-stage

Closes SE-1288

Merge request reports