Merge pull request #2973 from marek-safar/rs-Uri