Merge branch 'ps/stash-keep-untrack-empty-fix'