merge detached disk.c changes to master