Added support for intentionally avoiding timeout on client side