fix delivery_address

Merged Luciano Ortiz requested to merge 12.0-HF-T5622 into 12.0

Merge request reports