Merge pull request #3099 from marek-safar/rs-Semaphore