modify the request/response parameters order for convenience
allow to access the original request
Merge branch 'upstream' into develop