Support return_delete_token flag in upload