Merge branch 'sd/stash-wo-user-name'