Merge branch 'jc/stash-pop-not-popped' into maint