Merge branch 'tg/stash-keep-index-with-removed-paths'