Merge pull request #4202 from marek-safar/compression