Merge branch 'tg/worktree-create-tracking'