[FIX]Split Code

Merged Gastón Bertolani requested to merge 11.0-split-code into 11.0-stage

Merge request reports