Merge branch 'js/range-diff'