Merge change 1582 into donut

* changes:
  Teleca 2b changes.