Merge branch 'js/rebase-orig-head-fix'