Merge commit '35feec46d90d434a2439765d127a9e8f68a52340' * commit '35feec46d90d434a2439765d127a9e8f68a52340': TODO's from Teleca with modifications from wink.
Merge commit '35feec46d90d434a2439765d127a9e8f68a52340' * commit '35feec46d90d434a2439765d127a9e8f68a52340': TODO's from Teleca with modifications from wink.