Merge branch 'jc/combine-diff-callback'