Merge branch 'rr/rebase-autostash' into next