track spans in t2s translation
Merge remote-tracking branch 'upstream/master'
fix