Merge pull request #9037 from annando/fix-network-view