City configuration

Merged Tomás Canzoniero requested to merge city_configuration into 11.0-stage

Merge request reports