Merge up to '38c6c385a95766d72d9c564ad9edde8c03986134'

Git URL : https://github.com/DBCTRADO/TVTest/commit/38c6c385a95766d72d9c564ad9edde8c03986134
Revision: 13
Merge up to '45955edc15a25d790703233d158681d57fbd3284'

Git URL : https://github.com/DBCTRADO/TVTest/commit/45955edc15a25d790703233d158681d57fbd3284
Revision: 14