Changes from 'tv' merged into 'develop' 

Merged in all the changes from PR #2356 into develop

<!---
@huboard:{"order":991.71875}
-->