Merge branch 'preexisting-disks' into working