Merge branch 'js/rebase-i-with-colliding-hash' into maint