add filter for disabled netdevices
Merge branch 'master' into 2.x