[MOD] Adapatation with base_address_city

Merged Leandro Martinek requested to merge 12.0-base_address_city into 12.0-stage

Merge request reports