Merge pull request #4205 from marek-safar/compression