Merge branch 'ph/stash-rerere'