reduce ambiguity due to pass through rules in t2s translation
Merge remote-tracking branch 'upstream/master'