Merge branch 'js/rebase-r-and-merge-head'