Merge "refactor TSN"