Merge pull request #3063 from marek-safar/rs-Net