Merge "mmap: improvements"