Merge branch 'js/stash-dwim' into tr/reset-checkout-patch