Merge branch 'js/diff-files-i-t-a-fix-for-difftool'