Merge "Make v1 create_image & update_image use **kwargs"