Merge pull request #3183 from marek-safar/bug41874