Merge branch 'tg/stash-with-pathspec-fix' into maint