Merge change 8061 into donut

* changes:
  Throw a connecting exception when timed out.