Merge branch 'js/diff-ni'