Merge branch 'use-netlink' into fdn-mods