Merge branch 'jc/stash-create'