Resolve EMU-1 "11.0 "

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

Closes EMU-1

Merge request reports