Merge branch 'jk/diff-blob'