Merge branch 'refactor-tc_action-structs'