Merge branch 'rr/rebase-autostash-fix' into maint