BUG-5280: refactor AbstractClientConnection