Merge early parts of branch 'js/diff'