Merge branch 'new/stash'