Merge branch 'rr/rebase-autostash'