Merge branch 'noc-1956-2' into 'master'

noc/noc#1956 Fix detect address usage with included special addresses.

See merge request !6861

(cherry picked from commit a4ba375f)

0d0df33a Fix detect address usage with included special addresses.
6 jobs for !6865 with cherry-pick-a4ba375f in 14 minutes and 58 seconds (queued for 5 seconds)
latest merge request