Moved -> Moved-prod
Merge pull request #1697 from fstagni/fixTSClientDerived

[v6r9] Moved -> Moved-prod
v6r9p24
v6r10-pre11
Conflicts resolved with rel-v6r9