Fixes after merging - v6r0 onward
Merge pull request #1715 from fstagni/fixTSClientAfterMerging

[v6r10] Fixes after merging - v6r10 onward