Merge pull request #3373 from marek-safar/net-4.6.2