Merge branch 'sg/t3420-autostash-fix'