[RM]Pos City and clean code

Merged Gastón Bertolani requested to merge 11.0-rm-pos-city into 11.0-stage

Merge request reports