Merge
Merge
Also deactivate monitoring on iface
Also check name resolution