Merge branch 'bw/rebase-autostash-keep-current-branch'