Merge pull request #2548 from annando/1605-network-widget