Merge branch 'js/rebase-autostash-fix'