Merge pull request #2999 from marek-safar/rs-FileWeb