Merge branch 'js/merge-rr-fix'