Merge branch 'rr/rebase-stash-store'