Merge pull request #2995 from marek-safar/rs-IPAddress