Merge branch 'pb/pull-rebase-autostash-fix'