Merge branch 'topic/noncached-mmap' into topic/misc