Merge branch 'mm/complete-rebase-autostash'