Resolve SE-67 "11.0 "

Merged Felipe Carlini requested to merge 11.0-SE-67 into 11.0-stage

Closes SE-67

Merge request reports