Merge branch 'noc-1940' into 'master'

#1940 Revert Prefix import to Address.

See merge request !6787

(cherry picked from commit 465e060e)

a2795170 Revert Prefix import to Address.
6 jobs for !6790 with cherry-pick-465e060e in 26 minutes and 53 seconds (queued for 4 seconds)
latest merge request