Merge branch 'jk/prompt-stash-could-be-packed' into maint