Code

Merge branch 'jk/combine-diff-binary-etc'