Editorial: move handling of request's "client" to its own steps

Editorial: move handling of request's "client" to its own steps #1702