Merge branch 'js/rebase-i-autosquash-fix'