Merge branch 'tc_action-fixes'