Merge pull request #1968 from ktsaou/master

netdev_added cleanup and recalculation;