Merge branch 'pb/stash-refuse-to-kill'