Merge change 2761 into donut

* changes:
  TODO's from Teleca with modifications from wink.