ENG-4324: taking pmartel feedback on client timout special handling