Merge branch 'jm/stash-doc-k-for-keep'