Merge branch 'js/diff'