Merge pull request #3003 from marek-safar/rs-NetworkInformation