Merge branch 'refactor-duplicate-codes-in-the-tc-cls-walk-function'