Don't introduce new parameter for resolve_redirect
Merge pull request #598 from untitaker/redirect_client

Don't introduce new parameter for resolve_redirect