Merge branch 'sf/complete-stash-list'