Merge branch 'chunk-mmap'