Merge branch 'ns/stash'