Merge branch 'netdev_iflink_remove'