Merge branch 'js/rebase' into HEAD