Merge branch 'aw/numbered-stash'