Resolve EMU-1 "11.0 "

Merged Felipe Carlini requested to merge 11.0-EMU-2 into 11.0-stage

Closes EMU-2

Merge request reports