More work on bug #8138.  Working on image uploading.