Merge branch 'js/builtin-rebase-perf-fix-err-fix'