Merge change 3126 into donut

* changes:
  Fix thread safety in DataConnectionTracker.