Merge pull request #652 from nulltoken/topic/diff-callbacks diff: provide more context to the consumer of the callbacks