Further fix for tun/tap and topology
(cherry picked from commit 2284daf2986124fc7786641774fbc3064e001465)
Further fix for tun/tap and topology
(cherry picked from commit 2284daf2986124fc7786641774fbc3064e001465)