Conforms to the new request model
Merge branch 'new-request'