ad8195bb0e
Merge commit '2f11599eb317887a8cca14d8e66bfc485e5169e7' * commit '2f11599eb317887a8cca14d8e66bfc485e5169e7': Teleca 2b changes