Merge branch 'wc/diff'