Merge branch 'ac/complete-pull-autostash'