Merge "Use create_image_from_server to create image for server"