Merge branch 'ps/rebase-i-auto-unstash-upon-abort'