Merge branch 'master' into chunk_compression