[v610] Few fixes for TS in v6r10, mainly for backward compatibility