Merge "Make create_disk() persistent"