Merge branch 'js/diff-ni' (early part)