Merge branch 'master' into js/diff-ni