Merge branch 'zk/difftool-counts'