release-22.2:Backport!6787

Merged Andrey Vertiprahov requested to merge cherry-pick-465e060e into release-22.2

#1940 (closed) Revert Prefix import to Address.

See merge request !6787 (merged)

(cherry picked from commit 465e060e)

a2795170 Revert Prefix import to Address.

Merge request reports