Merge change 1831 into donut

* changes:
  Tear down data, if a disconnect request is pending.