Merge branch 'nm/stash-untracked'