Merge change 4080 into donut

* changes:
  Fix data connection issues.