Merge branch 'jk/stash-list-p' into jch