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