am 8d878c34: Merge change 1578 into donut

Merge commit '8d878c344137974a5cb611c8b4ecbceacccb9016'

* commit '8d878c344137974a5cb611c8b4ecbceacccb9016':
  Teleca 2b changes.