Allowing to pass in request so that overwrites can check against request headers
Merge branch 'master' into patch-1