Merge branch 'tg/stash-untracked-with-pathspec-fix'