Merge branch 'js/rebase-stat-unrelated-fix'