feat: improve device linking and discovery

[olastor]

First commit is purely based on the patch provided by @m-ueberall , in the second commit I made a few changes (see commit description).