Merge branch 'tc-action-fixes'