Merge branch 'iomap' into cleanup