Some merges from KK Ramdisk.